Bug 343338: Eliminate "my" variables from the root level of modules

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=myk
updated pot file
author: mkanat%bugzilla.org <> 2006-07-14 04:55:43 +0000
committer: mkanat%bugzilla.org <> 2006-07-14 04:55:43 +0000
commit: 7f9a841d4ceeb5b6bb1648c702c2c753b1d75a51 (patch)
tree: 112e4eb1bcd323126b326da07ab34b8cf2258a28 /Bugzilla/User
parent: 9f7ba4e2a5a3b7a4a22e160343b7571058736199 (diff)
download: bugs-7f9a841d4ceeb5b6bb1648c702c2c753b1d75a51.tar
bugs-7f9a841d4ceeb5b6bb1648c702c2c753b1d75a51.tar.gz
bugs-7f9a841d4ceeb5b6bb1648c702c2c753b1d75a51.tar.bz2
bugs-7f9a841d4ceeb5b6bb1648c702c2c753b1d75a51.tar.xz
bugs-7f9a841d4ceeb5b6bb1648c702c2c753b1d75a51.zip
0 files changed, 0 insertions, 0 deletions
diff --git a/po/af.po b/po/af.po
index b5b9efd6..05f2a77d 100644
--- a/po/af.po
+++ b/po/af.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-af\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\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"
@@ -62,7 +62,7 @@ msgstr "Verwyderbare media"
 msgid "Path or mount point:"
 msgstr "Pad of hegpunt:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Sekuriteitsopgraderings"
@@ -130,9 +130,9 @@ msgstr "Tipes media:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Kanselleer"
@@ -141,10 +141,10 @@ msgstr "Kanselleer"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -330,8 +330,8 @@ msgstr "Media limiet"
 msgid "Command"
 msgstr "Opdrag"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(geen)"
@@ -422,7 +422,7 @@ msgstr "Dateer media op"
 msgid "Regenerate hdlist"
 msgstr "Hergenereer die hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Net 'n oomblik, media word vervris..."
@@ -517,12 +517,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Loop in gebruikermodus"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -533,572 +533,572 @@ msgstr ""
 "Alhoewel u steeds in die bestaande databasis kan rondblaai\n"
 " sal u nie instaat wees om veranderinge te maak nie."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Toeganklikheid"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Data Wegbêre"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Rugsteun"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Skryf van CDs"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Saampers"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Ander"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Boeke"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Rekenaarboeke"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Neulvrae"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Vertel my"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Letterkunde"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Kommunikasie"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Databasisse"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Ontwikkeling"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME en GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE en Qt"
 
 #
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Redigeerders"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Kommunikasie"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Nastrewers"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Nutsprogramme vir lêers"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Speletjies"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Avontuur"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Bordspel"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kaarte"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Legkaarte"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategie"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Grafiese gebruikskoppelvlak"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM gebaseer"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Monitor"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "multimedia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Netwerk"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Klets"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Lêeroordrag"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Kitsboodskappe"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "e-Pos"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Nuus"
 
 #
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Eksterne toegang"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Kantoor"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Publisering"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Wetenskappe"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Sterrekunde"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologie"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Chemie"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Rekenaarswetenskap"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geowetenskap"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Wiskunde"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fisika"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Aantekentolke"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Klank"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Rekenaar"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Basis"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurasie"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Selflaai en Init"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Hardeware"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Verpakking"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Drukkers"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Ontwikkeling"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Ontwikkeling"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Lettertipes"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Instruksielyn"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "Egte Tipe"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Tipe1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Internasionalisering"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel en hardeware"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Programmateke"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Bedieners"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminale"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Teksverwante Nutsprogramme "
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Speelgoeters"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Onbeskikbaar)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Soekverslag"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Soekverslag (none)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Net 'n oomblik, besig met soektog...."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Staak"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Opgradeerbaar"
 
 #
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Byvoegbaar"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Gekose"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Nie gekies nie"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Meer inligting rakende pakket..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Kies asseblief"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Een van die volgende pakkette word benodig:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Net 'n oomblik, skep 'n lys van pakkette"
 
 #
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Geen opdatering"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1109,28 +1109,28 @@ msgstr ""
 "opgradering pakkette beskikbaar vir die tans op u rekenaar\n"
 "óf u het alreeds hulle almal geïnstalleer."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Alles"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Meer inligting"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Inligting rakende pakkette"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Addisionele pakkette moet ook verwyder word"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1141,12 +1141,12 @@ msgstr ""
 "pakket(te) verwyder word:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Sommige pakkette kan nie verwyder word nie"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1155,7 +1155,7 @@ msgstr ""
 "Jammer maat, nou wil jy jou Linux rekenaar vernietig:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1166,12 +1166,12 @@ msgstr ""
 "nie gekies word nie:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Addisionele pakkette word benodig"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1182,17 +1182,17 @@ msgstr ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Sommige pakkette kan nie geïnstalleer word nie"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1203,132 +1203,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Somige pakette sal moet verwyder word"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Gekies: %d MB / Oop skyfspasie: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Gekose pakkette: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Lêers:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Veranderingestaaflêer:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Media: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Tans geïnstalleer: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Weergawe: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Grootte: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Belangrikhied: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Opsomming: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Rede om op te dateer:"
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Beskrywing: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Foutkorreksiegraderings"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Normale opdaterings"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux keuses"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Alle pakette, alfabeties"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Alle pakkette, volgens groep"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Alle pakkette, volgens grootte"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Alle pakette, volgens wie gekies is"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Alle pakette, volgens mediabron"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Alle pakkette, volgens beskikbare opgraderings"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Slegs eindpunte, gesorteer volgens installasiedatums"
@@ -1359,7 +1364,7 @@ msgstr "Kies weer oor"
 msgid "Reload the packages list"
 msgstr "Herlaai die lys van pakkette"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Dateer media op"
@@ -1776,6 +1781,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1789,158 +1799,181 @@ msgstr ""
 "beskikking op CDROM of DVD. Hierdie nutsprogram kan u help met\n"
 "die keuses asook die installasie daarvan."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Verwyder Sagteware"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Opdaterings"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Nee"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Inligting..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Australië"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australië"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "België"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasilië"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Tsjeggiese Republiek"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Duitsland"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Denemarke"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Griekeland"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Spanje"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Frankryk"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Italië"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norweë"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Pole"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rusland"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Swede"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Verenigde Koninkryk"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "China"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Verenigde State"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Ek moet Mandrakesoft se webwerf kontak vir 'n lys van die\n"
+"spieëlwebplekke. Maak tog seker u netwerk is funksioneel.\n"
+"\n"
+"Kan ons voortgaan?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1953,18 +1986,38 @@ msgstr ""
 "\n"
 "Kan ons voortgaan?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Net 'n oomblik, laai die spieëlplekke se adresse van MandrakSoft af."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Net 'n oomblik, laai die spieëlplekke se adresse van MandrakSoft af."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Probleme gedurende die aflaai"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Probleme om die lys van spieëlwebplekke te bekom:\n"
+"\n"
+"%s\n"
+"Of die network, of Mandrakesoft se webwerf is moonlik onbeskikbaar.\n"
+"Probeer asseblief weer later."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1979,12 +2032,17 @@ msgstr ""
 "Of die network, of Mandrakesoft se webwerf is moonlik onbeskikbaar.\n"
 "Probeer asseblief weer later."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Geen spieëlwebplekke"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1999,64 +2057,64 @@ msgstr ""
 "is waneer die argitektuur van u verwerker nie ondersteun word deur\n"
 "'Mandrakelinux Official Updates' nie."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Kies asseblief 'n spieëlwebplek."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Ondersoek medialêer '%s'....."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Ondersoek die afgeleë medialêer '%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr "voltooi."
 
 #
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " gefaal!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s from media %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Begin die aflaai van '%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Aflaai van '%s',tyd gelede:%s, spoed: %s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Aflaai van '%s', spoed: %s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2067,17 +2125,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Kies die media wat u wil opdateer:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Opgradeer"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2090,7 +2148,7 @@ msgstr ""
 "Foute:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2098,18 +2156,18 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Probleme met skep van media."
 
 #
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "Net 'n oomblik, Voeg media by..."
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2120,7 +2178,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2386,10 +2452,6 @@ msgstr "Nie herkenbare oorplaas kodering\n"
 msgid "Unknown error code %d\n"
 msgstr "Onbekende foutkode %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Opdaterings"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Installeer Sagteware"
diff --git a/po/am.po b/po/am.po
index 89cb201d..32ffced6 100644
--- a/po/am.po
+++ b/po/am.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-04-19 13:59+0200\n"
 "Last-Translator: Alemayehu Gemeda <alemayehu@gmx.at>\n"
 "Language-Team: Amharic <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "Path or mount point:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr ""
@@ -119,9 +119,9 @@ msgstr ""
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "ተወው"
@@ -130,10 +130,10 @@ msgstr "ተወው"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "እሺ"
@@ -312,8 +312,8 @@ msgstr ""
 msgid "Command"
 msgstr "ትእዛዝ"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, fuzzy, c-format
 msgid "(none)"
 msgstr "ጨርሷል"
@@ -400,7 +400,7 @@ msgstr ""
 msgid "Regenerate hdlist"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr ""
@@ -486,12 +486,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -499,568 +499,568 @@ msgid ""
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "የመገኘት ሁኔታ"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "መዝገብ ቤት"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "ቤካፕ"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, fuzzy, c-format
 msgid "Cd burning"
 msgstr "%d ሀረጎች"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "መጠቅጠቅ"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "ሌላ"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr ""
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "መገናኛዎች"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "ዳታቤዝ"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "እድገት"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr ""
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr ""
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr ""
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "አርትኢዎች"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr ""
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "ተስተካካዮች"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "የፋይል መሳሪያዎች"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "ጨዋታዎች"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "አደገኛ ሁኔታ"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "አርኬድ"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "ቦርዶች"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "ካርዶች"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "እንቆቅልሾች"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr ""
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "እቅድ"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr ""
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr ""
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "ኖም"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr ""
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr ""
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr ""
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "ንድፍ"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "መቆጣጠር"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "የመገናኛ ብዙሃን"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "መረብ"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "ውይይት"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "ፋይል ማዛወር"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "ፈጣን መልእክት"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "ፖስታ"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "ዜና"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "በርቀት ማየት "
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "ቢሮ"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "ማሳተም"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "ሳይንስ"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "የፈለክ ጥናት"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "ባዮሎጂ"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "ኬሚስትሪ"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "ኮምፒውተር ሳይንስ"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "የስነ-ምድር ሳይንስ"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "ሂሳብ"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "ፊዚክስ"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "ሼሎች"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "ድምፅ"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "ሲስተም"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr ""
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "ማስተካከያ"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "ማስጀመሪያ"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "ሀርድዌር"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr ""
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "ህትመት"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr ""
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr ""
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "የፊደል ቅርጾች"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr ""
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr ""
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr ""
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr ""
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr ""
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "ተርሚናሎች"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "የመጻፊያ መሳሪያዎች"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "አሻንጉሊቶች"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "ቪዲዮ"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr ""
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr ""
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr ""
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr ""
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "አቁም"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr ""
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr ""
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr ""
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr ""
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr ""
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1068,28 +1068,28 @@ msgid ""
 "or you already installed all of them."
 msgstr ""
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "ሁሉንም"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr ""
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1097,19 +1097,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1117,12 +1117,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1130,17 +1130,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1148,132 +1148,137 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr ""
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "ስም: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "ዝርያ: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "መጠን: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr ""
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "አስፈላጊነት: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "ማጠቃለያ፦"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr ""
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr ""
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr ""
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr ""
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr ""
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
@@ -1303,7 +1308,7 @@ msgstr ""
 msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr ""
@@ -1662,6 +1667,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1670,158 +1680,177 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Software Update"
+msgstr ""
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr ""
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "አይ"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "አዎ"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "ኦስትሪያ"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "አውስትሬሊያ"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "ቤልጄም"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "ብራዚል"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "ካናዳ"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "ኮስታሪካ"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "ቼክ ሪፑብሊክ"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "ጀርመን"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "ግሪክ"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "ስፔን"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "ፊንላንድ"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "ፈረንሳይ"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "እስራኤል"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, fuzzy, c-format
 msgid "Italy"
 msgstr "አጠቃላይ"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "ጃፓን"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "ኮሪያ ሪፐብሊክ"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "ኔዘርላንድ"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "ኖርዌይ"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "ፖላንድ"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, fuzzy, c-format
 msgid "Portugal"
 msgstr "አጠቃላይ"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "ራሺያ"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "ስዊድን"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "ታይዋን"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "እንግሊዝ"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "ቻይና"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "አሜሪካ"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1830,18 +1859,33 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1851,12 +1895,17 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr ""
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1866,63 +1915,63 @@ msgid ""
 "by Mandrakelinux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, fuzzy, c-format
 msgid " done."
 msgstr "ጨርሷል"
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr ""
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -1933,17 +1982,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr ""
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr ""
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -1952,7 +2001,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -1960,17 +2009,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -1978,7 +2027,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2244,10 +2301,6 @@ msgstr ""
 msgid "Unknown error code %d\n"
 msgstr ""
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr ""
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 1094ea5e..993a4b76 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-09-23 03:48+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabeyes <support@arabeyes.org>\n"
@@ -59,7 +59,7 @@ msgstr "الأجهزة القابلة للإزالة"
 msgid "Path or mount point:"
 msgstr "المسار أو نقطة التحميل:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "تحديثات أمنية"
@@ -124,9 +124,9 @@ msgstr "نوع الوسط:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "الغاء"
@@ -135,10 +135,10 @@ msgstr "الغاء"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "موافق"
@@ -319,8 +319,8 @@ msgstr "حد الوسائط"
 msgid "Command"
 msgstr "الأمر"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(لا شئ)"
@@ -409,7 +409,7 @@ msgstr "حدّث الوسيط"
 msgid "Regenerate hdlist"
 msgstr "أعد توليد hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "انتظر من فضلك، جاري تحديث الوسائط..."
@@ -509,12 +509,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "تمّت إضافة الوسيط `%s' بنجاح."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "جاري التشغيل في وضع المستخدم"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -525,568 +525,568 @@ msgstr ""
 "لن يكون باستطاعتك القيام بتعديلات على النظام،\n"
 "لكن لا يزال بإمكانك استعراض قاعدة البيانات الموجودة."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "تسهيلات المعاقين"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "أرشفة"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "النسخ الاحتياطي"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "نسخ الأقراص"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "الضغط"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "أخرى"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "كتب"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "كتب الكمبيوتر"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "أسئلة متكررة"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "مذكرات (كيف أعمل)"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "أدب"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "عنقود"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "تمرير الرّسائل"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "خدمات الاصطفاف"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "اتصالات"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "قواعد البيانات"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "تطوير"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME و GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "جافا"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE و Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "النواة"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "بيرل"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "بايثون"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "محررات النصوص"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "تعليم"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "المحاكيات"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "أدوات الملفات"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "ألعاب"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "مغامرات"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "ألعاب الأركيد"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "ألعاب لوحات"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "ألعاب ورقية"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "ألغاز"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "رياضة"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "استراتيجية"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "سطح المكتب الرسومي"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "مبنية على FVWM"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "كيدي"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "الرسوم"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "مراقبة النظام"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "الوسائط المتعدّدة"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "الشبكات"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "محادثة"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "نقل الملفات"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "المراسلة الفورية"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "بريد"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "برامج الأخبار"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "الوصول البعيد"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "الويب"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "برامج المكتب"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "المفاتيح العامّة"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "النشر"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "علوم"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "علم الفلك"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "أحياء"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "كيمياء"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "علوم الحاسب"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "علوم الأرض"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "رياضيات"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "فيزياء"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "برامج سطر الأوامر"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "الصوت"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "النظام"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "الحزم الأساسية"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "التهيئة"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "الإقلاع و بدء التشغيل"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "العتاد"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "التحزيم"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "الطباعة"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "الانتشار"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "نشر"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "الخطوط"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "سطر الأوامر"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True Type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "التدويل"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "النواة و العتاد"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "المكتبات"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "الخادمات"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "محاكيات الطرفيات"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "أدوات النصوص"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "ألعاب طفولية"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "فيديو"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(غير موجود)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "نتائج البحث"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "نتائج البحث (لا شئ)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "انتظر من فضلك، جاري البحث..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "معالج حزم ماندريك (Rpmdrake)"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "قف"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "قابلة للترقية"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "قابلة للإضافة"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "مختار"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "غير مختارة"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "معالج حزم ماندريك (Rpmdrake) %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "معلومات أكثر حول الحزمة..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "فضلاً اختر"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "أحد هذه الحزم مطلوب:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "انتظر من فضلك، جاري سرد الحزم..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "لا تحديث"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1097,28 +1097,28 @@ msgstr ""
 "لا توجد تحديثات للحزم الموجودة على جهازك،\n"
 "أو أنك قمت بتثبيت كل التحديثات مسبقا."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "الكلّ"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "مزيد من المعلومات"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "معلومات حول الحزم"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "هذه الحزم الاضافية يجب أن تحذف"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1129,12 +1129,12 @@ msgstr ""
 "تحذف:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "بعض الحزم لا يمكن حذفها"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1143,7 +1143,7 @@ msgstr ""
 "ازالة هذه الحزم قد تكسر نظامك، عذراً:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1154,12 +1154,12 @@ msgstr ""
 "الرجوع عن اختيارها الآن:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "هناك حزم اضافية مطلوبة"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1170,17 +1170,17 @@ msgstr ""
 "التالية:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (تنتمي إلى القائمة الواجب تخطّيها)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "لا يمكن تثبيت بعض الحزم"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1191,132 +1191,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "بعض الحزم يجب ازالتها"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "تم اختيار: %d ميغابايت / المساحة المتوفرة في القرص: %d ميغابايت"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "الحجم المختار: %d ميغابايت"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "الوصف غير متوفّر لهذه الحزمة\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "الملفات:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "سجل التغييرات:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "الوسيط: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "الإصدار المثبت حالياً:"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "الإسم: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "الإصدار: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "الحجم: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "الأهمية: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "نبذة: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "سبب التحديث:"
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "وصف:"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "تحديثات ازالة العيوب"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "تحديثات عادية"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "خيارات ماندريك لينكس"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "كل الحزم، أبجدياً"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "كل الحزم، بالمجموعة"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "كل الحزم، بالحجم"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "كل الحزم، بحالة الإختيار"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "كل الحزم، بمخزن الوسيط"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "كل الحزم، بتوافر التحديث"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "المتروكات فقط، مرتبة حسب تاريخ التثبيت"
@@ -1346,7 +1351,7 @@ msgstr "أعد الإختيار من جديد"
 msgid "Reload the packages list"
 msgstr "أعد تحميل قائمة الحزم"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "حدّث الوسائط"
@@ -1484,7 +1489,7 @@ msgstr ""
 "لديك على الأقل وسيط تحديث واحد تمت تهيئته، لكن\n"
 "جميعهم معطلون حالياً. يجب عليك تشغيل مدير وسائط\n"
 "البرامج لتمكين واحد على الأقل (قم بالتأشير عليها في عامود التمكين؟).\n"
-"ثم قم بإعادة تشغيل أداة تحديث ماندريك."
+"ثم قم بإعادة تشغيل أداة %s."
 
 #: ../rpmdrake:1140
 #, c-format
@@ -1504,7 +1509,7 @@ msgstr ""
 "قم بتشغيل مدير وسائط البرامج، ثم أضف وسيط 'تحديثات\n"
 "أمنية'.\n"
 "\n"
-"ثم أعد تشغيل أداة تحديث ماندريك."
+"ثم أعد تشغيل أداة %s."
 
 #: ../rpmdrake:1170
 #, c-format
@@ -1753,13 +1758,18 @@ msgid ""
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 msgstr ""
-"أهلا بك في تحديث ماندريك!\n"
+"أهلا بك في %s!\n"
 "\n"
 "هذه الأداة ستساعدك في اختيار التحديثات التي تريد تثبيتها على\n"
 "جهازك."
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1773,158 +1783,181 @@ msgstr ""
 "برامجية على أقراص CDROM أو DVD. ستساعدك هذه الأداة في اختيار البرامج\n"
 "اّلتي تريد تثبيتها على حاسوبك."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "تحديث حزم البرامج"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "تحديث ماندريك لينكس"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "لا"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "نعم"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "معلومات..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "النمسا"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "أوستراليا"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "بلجيكا"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "البرازيل"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "كندا"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "كوستاريكا"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "جمهورية التشيك"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "ألمانيا"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "الدنمارك"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "اليونان"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "أسبانيا"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "فنلندا"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "فرنسا"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "اسرائيل"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "ايطاليا"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "اليابان"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "كوريا"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "هولندا"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "النرويج"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "بولندا"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "البرتغال"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "روسيا"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "السويد"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "تايوان"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "المملكة المتحدة"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "الصين"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "الولايات المتحدة"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"أحتاج للإتّصال بموقع ماندريك سوفت للحصول على قائمة المرايا.\n"
+"تأكّد من فضلك أنّ شبكتك تعمل حالياً.\n"
+"\n"
+"هل من الممكن المتابعة ؟"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1937,18 +1970,38 @@ msgstr ""
 "\n"
 "هل من الممكن المتابعة ؟"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "إنتظر من فضلك، يجري تنزيل عناوين المرايا من موقع ماندريك سوفت."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "إنتظر من فضلك، يجري تنزيل عناوين المرايا من موقع ماندريك سوفت."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "خطأ أثناء التنزيل"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"حدث خطأ عند تنزيل قائمة المرايا:\n"
+"\n"
+"%s\n"
+"الشّبكة، أو موقع ماندريك سوفت، قد يكونا غير متوفّرين.\n"
+"حاول مجدّدا في وقت لاحق من فضلك."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1963,12 +2016,17 @@ msgstr ""
 "الشّبكة، أو موقع ماندريك سوفت، قد يكونا غير متوفّرين.\n"
 "حاول مجدّدا في وقت لاحق من فضلك."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "لا مرايا"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1983,63 +2041,63 @@ msgstr ""
 "أن تكون هندسة معالجك غير مدعومة\n"
 "من طرف تحديثات ماندريك لينكس الّرسمية."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "فضلاً اختر المرآة المطلوبة."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "جاري نسخ الملف للوسيط `%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "جاري اختبار الملف للوسيط `%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "جاري اختبار الملف البعيد للوسيط `%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " تم."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " فشل!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s من الوسيط %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "جاري بدء تنزيل `%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "تنزيل `%s'، الوقت المتبقي:%s، السرعة:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "تنزيل `%s'، السرعة:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "خطأ في استرجاع الحزم"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2055,17 +2113,17 @@ msgstr ""
 "لإعداده من جديد، و إمّا الوسيط غير قابل للوصل حاليا و بالتّالي فعليك\n"
 "بالمحاولة مجدّدا فيما بعد."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "اختر الوسائط التي تريد تحديثها:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "حدّث"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2078,7 +2136,7 @@ msgstr ""
 "الأخطاء:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2089,17 +2147,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "تعذر انشاء الوسيط"
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "فشل عند إضافة الوسيط"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2110,7 +2168,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"وسيطك `%s'، المستعمل للتّحديثات، لا يطابق إصدارة ماندريك لينكس الّتي تشغّلها (%"
+"s).\n"
+"سيتمّ تعطيله."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2379,10 +2448,6 @@ msgstr "تشفير نقل لم يتم التعرف عليه\n"
 msgid "Unknown error code %d\n"
 msgstr "شفرة خطأ غير معلومة %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "تحديث ماندريك لينكس"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "تثبيت البرامج"
diff --git a/po/az.po b/po/az.po
index 704f7c24..1ce83516 100644
--- a/po/az.po
+++ b/po/az.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-az\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\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"
@@ -63,7 +63,7 @@ msgstr "Çıxardıla bilən avadanlıq"
 msgid "Path or mount point:"
 msgstr "Cığır ya da bağlama nöqtəsi:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Təhlükəsizlik yeniləmələri"
@@ -130,9 +130,9 @@ msgstr "Mediyum növü:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Ləğv et"
@@ -141,10 +141,10 @@ msgstr "Ləğv et"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Oldu"
@@ -326,8 +326,8 @@ msgstr "Mediya sərhədi"
 msgid "Command"
 msgstr "Əmr"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(heç biri)"
@@ -416,7 +416,7 @@ msgstr "Mediyumu yenilə"
 msgid "Regenerate hdlist"
 msgstr "hdlist'i yenidən yarat"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Xahiş edirik gözləyin, mediya yenilənir..."
@@ -516,12 +516,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "`%s' mediyumu müvəffəqiyyətlə əlavə edildi."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "İstifadəçi modunda işləyir"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -532,568 +532,568 @@ 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:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Yetişmə Qabiliyyəti"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Arxivləmə"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Ehtiyatlama"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Cd yazma"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Sıxışdırma"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Digər"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Kitablar"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Kompüter kitabları"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Çox Soruşulan Suallar"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howto sənədləri"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Ədəbiyyat"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Klaster"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "İsmarış Keçməsi"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "Xidmətlər Növbəyə Alınır"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Rabitə"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Mə'lumat bazaları"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "İnkişaf"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME və GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE və Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Çəyirdək"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Editorlar"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Maarif"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulyatorlar"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Fayl vasitələri"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Oyunlar"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Macəra"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Əyləncə"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Lövhə oyunları"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kartlar"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Tapmacalar"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "İdman"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategiya"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Qrafiki masa üstü"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM əsaslı"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Qrafika"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "İzləmə"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedya"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Şəbəkə"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Söhbət"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Fayl transferi"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Canlı ismarışlaşma"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Poçt"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Xəbərlər"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Uzaqdan yetişmə"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Offis"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Açıq Açarlar"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Nəşr"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Elm"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomiya"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biyologiya"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Kimya"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Kompüter elmi"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geologiya elmləri"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Riyaziyyat"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Qabıqlar"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Səs"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sistem"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Əsas"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Quraşdırma"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Açılış və Init"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Avadanlıq"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Paketləmə"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Çap"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "İnkişaf"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "İnkişaf"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Yazı növləri"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konsol"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Növ1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitməpi"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Yerliləşdirmə"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Çəyirdək və avadanlıq"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Kitabxanalar"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Vericilər"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminallar"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Mətn vasitələri"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Oyuncaqlar"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Mövcud deyil)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Axtarış nəticələri"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Axtarış nəticələri (heçnə)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Xahiş edirik gözləyin, axtarılır..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Dayan"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Yenilənə bilən"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Əlvə edilə bilən"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Seçili"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Seçili deyil"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Paket haqqında daha çox mə'lumat..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Xahiş edirik seçin"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Aşağıdakı paketlərin birinə ehtiyac var:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Xahiş edirik gözləyin, paketlər sıralanır..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Yeniləmə yoxdur"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1104,28 +1104,28 @@ 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:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Hamısı"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Daha çox mə'lumat"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Paketlər haqqında mə'lumat"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Bə'zi əlavə paketlər kənar edilməlidir"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1135,12 +1135,12 @@ msgstr ""
 "Asılılıqlarına görə, bu paket(lər) də silinməlidir\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Bə'zi paketlər silinə bilməz"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1149,7 +1149,7 @@ msgstr ""
 "Bu paketləri çıxartmaq sisteminizi xarab edəcək, üzr istəyirik:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1160,12 +1160,12 @@ msgstr ""
 "seçilməməlidir:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Əlavə paketlərə ehtiyac var"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1176,17 +1176,17 @@ msgstr ""
 "qurulmalıdır:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Bə'zi paketlər qurula bilməz"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1197,132 +1197,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Bəzi paketlər kənar edilməlidir"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seçili: %d MB / Boş disk sahəsi: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Seçili böyüklük: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "BU paketin izahatı mövcud deyil\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Fayllar:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Dəyişmə qeydi:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Mediyum: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Hazırda qurulu olan buraxılış: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Ad: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Buraxılış: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Böyüklük: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Vaciblik: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "İcmal: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Yeniləmə səbəbi: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "İzahat: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Xəta düzəltməsi yeniləmələri"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Normal yeniləmələr"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux seçimləri"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Bütün paketlər, əlifba sırasına görə"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Bütün paketlər, qrupa görə"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Bütün paketlər, böyüklüklərinə görə"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Bütün paketlər, seçim vəziyyətinə görə"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Bütün paketlər, mediyumun saxlandığı yerə görə"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Bütün paketlər, yeniləmə imkanlarına görə"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Qurulma tarixinə görə sıralanmış, yalnız yarpaqlar"
@@ -1352,7 +1357,7 @@ msgstr "Seçimi sıfırla"
 msgid "Reload the packages list"
 msgstr "Paket siyahısını yenidən yüklə"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Mediyanı yenilə"
@@ -1768,6 +1773,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1781,158 +1791,181 @@ msgstr ""
 "Bu vasitə sizə kompüterinizə qurmaq istədiyiniz tə'minatları seçməkdə\n"
 "yardım edəcək."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Proqram Tə'minatlarının Yenilənməsi"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Xeyir"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Bəli"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Mə'lumat..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Avstriya"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Avstraliya"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belçika"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Braziliya"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Çex Respublikası"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Almanya"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Danimarka"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Yunanıstan"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "İspaniya"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finlandiya"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Fransa"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "İsrail"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "İtaliya"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Yaponiya"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Koreya"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Hollandiya"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norveç"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Polşa"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portuqaliya"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rusiya"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "İsveç"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Tayvan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Birləşmiş Krallıq"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Çin"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Birləşmiş Ştatlar"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Əks siyahılarını almaq üçün indi Mandrakesoft'a bağlanmaq lazımdır.\n"
+"Xahiş edirik, şəbəkənizin işlədiyini yoxlayın.\n"
+"\n"
+"Davam edilsin?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1945,7 +1978,14 @@ msgstr ""
 "\n"
 "Davam edilsin?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Xahiş edirik gözləyin, Mandrakesoft veb saytından əkslərin ünvanları "
+"endirilir."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
@@ -1953,12 +1993,27 @@ msgstr ""
 "Xahiş edirik gözləyin, Mandrakesoft veb saytından əkslərin ünvanları "
 "endirilir."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Endirmə əsnasında xəta"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Əkslərin siyahısı alınarkən xəta yarandı:\n"
+"\n"
+"%s\n"
+"Bəlkə də şəbəkə ya da Mandrakesoft veb saytı hazırda fəal deyil.\n"
+"Xahiş edirik, daha sonra yenidən sınayın."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1973,12 +2028,17 @@ msgstr ""
 "Bəlkə də şəbəkə ya da Mandrakesoft veb saytı hazırda fəal deyil.\n"
 "Xahiş edirik, daha sonra yenidən sınayın."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Əkssiz"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1993,63 +2053,63 @@ msgstr ""
 "isə CPU'nun quruluşunun Mandrakelinux Rəsmi Yeniləmələri\n"
 "tərəfindən dəstəklənməməsidir."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Xahiş edirik uyğun əksi seçin."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' mediyumu üçün köçürülür..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Mediyumun `%s' faylı yoxlanılır..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Mediyumun uzaqdakı`%s' faylı yoxlanır..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " bitdi."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr "bacarılmadı!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%2$s mənbəsindən %1$s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "`%s' endirilməyə başlanır..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' endirilir, qalan vaxt:%s, sür'ət:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' endirilir, sür'ət:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Paketlər alına bilmədi"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2062,17 +2122,17 @@ 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:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Yeniləmək istədiyiniz mediyanı seçin:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Yenilə"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2085,7 +2145,7 @@ msgstr ""
 "Xətalar:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2096,17 +2156,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Mediyum yaradıla bilmir."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Medium əlavə etmə xətası"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2117,7 +2177,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"yeniləmələr üçün işlətdiyiniz `%s' mediumu, Mandrakelinux buraxılışınız ilə "
+"(%s) uyğun gəlmi.\n"
+"O indi qeyri-fəallaşdırılacaqdır."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2386,10 +2457,6 @@ msgstr "Namə'lum transfer kodlaması\n"
 msgid "Unknown error code %d\n"
 msgstr "Namə'lum xəta kodu %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Proqram Qur"
diff --git a/po/be.po b/po/be.po
index c5e6638a..3fe5da9a 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2000-08-19 08:45+0200\n"
 "Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
 "Language-Team: be <be@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Аддалены прынтэр"
 msgid "Path or mount point:"
 msgstr "Пункт манціравання:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, fuzzy, c-format
 msgid "Security updates"
 msgstr "Бясьпека"
@@ -120,9 +120,9 @@ msgstr ""
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Адмена"
@@ -131,10 +131,10 @@ msgstr "Адмена"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Ок"
@@ -313,8 +313,8 @@ msgstr ""
 msgid "Command"
 msgstr "Каманда:"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(не)"
@@ -401,7 +401,7 @@ msgstr ""
 msgid "Regenerate hdlist"
 msgstr "Асноўныя пашырэнні"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr "Падрыхтоўка ўсталяваньня"
@@ -487,12 +487,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -500,568 +500,568 @@ msgid ""
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Зручнасьці"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr ""
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, fuzzy, c-format
 msgid "Backup"
 msgstr "Чорны"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr ""
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, fuzzy, c-format
 msgid "Compression"
 msgstr "Сэанс"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Іншыя"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, fuzzy, c-format
 msgid "Books"
 msgstr "Закладкі (cookies)"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, fuzzy, c-format
 msgid "Faqs"
 msgstr "Гульні"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, fuzzy, c-format
 msgid "Howtos"
 msgstr "Хост:"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, fuzzy, c-format
 msgid "Communications"
 msgstr "Канфігурацыя"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, fuzzy, c-format
 msgid "Databases"
 msgstr "База даньняў дыскаў"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Распрацоўка"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr ""
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr ""
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, fuzzy, c-format
 msgid "Java"
 msgstr "Японія"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, fuzzy, c-format
 msgid "Kernel"
 msgstr "Імя"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, fuzzy, c-format
 msgid "Perl"
 msgstr "Перу"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, fuzzy, c-format
 msgid "Python"
 msgstr "Радкі"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Рэдактары"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Канфігурацыя"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, fuzzy, c-format
 msgid "Emulators"
 msgstr "Калькулятар"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr ""
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Гульні"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr ""
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Аркады"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, fuzzy, c-format
 msgid "Boards"
 msgstr "Карты"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Карты"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, fuzzy, c-format
 msgid "Puzzles"
 msgstr "Пурпурны"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, fuzzy, c-format
 msgid "Sports"
 msgstr "Значкі"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, fuzzy, c-format
 msgid "Strategy"
 msgstr "Тактыка і стратэгія"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, fuzzy, c-format
 msgid "Graphical desktop"
 msgstr "Іншыя графічныя Працоўныя сталы"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr ""
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, fuzzy, c-format
 msgid "GNOME"
 msgstr "Той сама GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr ""
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr ""
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, fuzzy, c-format
 msgid "WindowMaker"
 msgstr "Паводзіны вокнаў"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Графіка"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Манітор"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Музыка й фільмы"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, fuzzy, c-format
 msgid "Networking"
 msgstr "Сетка"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr ""
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, fuzzy, c-format
 msgid "File transfer"
 msgstr "Мэнэджэр файлаў"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr ""
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr ""
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Пошта"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Навіны"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr ""
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr ""
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Офіс"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Выдавецтва"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, fuzzy, c-format
 msgid "Sciences"
 msgstr "Радкі"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Зоркаведаньне"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr ""
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr ""
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr ""
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr ""
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr ""
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, fuzzy, c-format
 msgid "Shells"
 msgstr "Абалонка:"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Гук"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Сістэма"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, fuzzy, c-format
 msgid "Base"
 msgstr "Басы"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Канфігурацыя"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr ""
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Абсталяваньне"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr ""
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Друкаваньне"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Распрацоўка"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Распрацоўка"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Шрыфты"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr ""
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, fuzzy, c-format
 msgid "True type"
 msgstr "Тып мышы: %s\n"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, fuzzy, c-format
 msgid "Type1"
 msgstr "Тып"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, fuzzy, c-format
 msgid "X11 bitmap"
 msgstr "Растар"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, fuzzy, c-format
 msgid "Internationalization"
 msgstr "Слоўнік GNOME"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, fuzzy, c-format
 msgid "Kernel and hardware"
 msgstr "Гл. апісанне абсталявання"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, fuzzy, c-format
 msgid "Libraries"
 msgstr "паслядоўная"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, fuzzy, c-format
 msgid "Servers"
 msgstr "Сервак"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, fuzzy, c-format
 msgid "XFree86"
 msgstr "Сервер XFree86 %s"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, fuzzy, c-format
 msgid "Terminals"
 msgstr "Тэрмінал GNOME"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr ""
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Цацкі"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Відэа"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, fuzzy, c-format
 msgid "(Not available)"
 msgstr "няма даступных раздзелаў"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, fuzzy, c-format
 msgid "Search results"
 msgstr "Адшукаць файлы на дыску"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr ""
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, fuzzy, c-format
 msgid "Please wait, searching..."
 msgstr "Падрыхтоўка ўсталяваньня"
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr ""
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Спыніць"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, fuzzy, c-format
 msgid "Upgradable"
 msgstr "Аркады"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, fuzzy, c-format
 msgid "Addable"
 msgstr "(адмовіць)"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, fuzzy, c-format
 msgid "Selected"
 msgstr "Абярыце файл"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, fuzzy, c-format
 msgid "Not selected"
 msgstr "Няма значкі"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr ""
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, fuzzy, c-format
 msgid "More information on package..."
 msgstr "Інфармацыя аб памяці"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, fuzzy, c-format
 msgid "Please choose"
 msgstr "калі ласка, пазначце тып вашай мышы."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, fuzzy, c-format
 msgid "One of the following packages is needed:"
 msgstr "Наступныя пакеты будуць даданы да сістэмы"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, fuzzy, c-format
 msgid "Please wait, listing packages..."
 msgstr "Усталяванне пакету %s"
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, fuzzy, c-format
 msgid "No update"
 msgstr "Імя друкаркі"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1069,28 +1069,28 @@ msgid ""
 "or you already installed all of them."
 msgstr ""
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Усё"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, fuzzy, c-format
 msgid "More info"
 msgstr "Дастасаваньні"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, fuzzy, c-format
 msgid "Information on packages"
 msgstr "Інфармацыя"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, fuzzy, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Наступныя пакеты будуць выдалены"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1098,19 +1098,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, fuzzy, c-format
 msgid "Some packages can't be removed"
 msgstr "Наступныя пакеты будуць выдалены"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1118,12 +1118,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1131,17 +1131,17 @@ msgid ""
 "\n"
 msgstr "Наступныя пакеты будуць даданы да сістэмы"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, fuzzy, c-format
 msgid "Some packages can't be installed"
 msgstr "Выбар пакетаў"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, fuzzy, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1149,132 +1149,137 @@ msgid ""
 "%s"
 msgstr "Наступныя пакеты будуць даданы да сістэмы"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, fuzzy, c-format
 msgid "Some packages need to be removed"
 msgstr "Наступныя пакеты будуць выдалены"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, fuzzy, c-format
 msgid "Selected size: %d MB"
 msgstr "Памер файла: %d байт"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, fuzzy, c-format
 msgid "Files:\n"
 msgstr "Файлы"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, fuzzy, c-format
 msgid "Changelog:\n"
 msgstr "Каналы:"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, fuzzy, c-format
 msgid "Currently installed version: "
 msgstr "Настройка драйверу Sun"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Імя: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, fuzzy, c-format
 msgid "Version: "
 msgstr "Версія:"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Памер: %s"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr ""
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, fuzzy, c-format
 msgid "Importance: "
 msgstr "важна"
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Агульныя зьвесткі"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Апісанне:"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, fuzzy, c-format
 msgid "Normal updates"
 msgstr "Рэжым Mmap"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, fuzzy, c-format
 msgid "Mandrakelinux choices"
 msgstr "Наладка вашага сэансу"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr ""
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, fuzzy, c-format
 msgid "All packages, by selection state"
 msgstr "Асабісты выбар пакетаў"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr ""
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
@@ -1304,7 +1309,7 @@ msgstr "Дзеяньні"
 msgid "Reload the packages list"
 msgstr "Выбар пакетаў"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, fuzzy, c-format
 msgid "Update media"
 msgstr "Іншыя"
@@ -1665,6 +1670,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1673,158 +1683,177 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Мэнэджэр сэрвісаў"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr ""
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Не"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Так"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, fuzzy, c-format
 msgid "Info..."
 msgstr "Інфармацыя"
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, fuzzy, c-format
 msgid "Austria"
 msgstr "Індастрыал"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, fuzzy, c-format
 msgid "Australia"
 msgstr "Індастрыал"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, fuzzy, c-format
 msgid "Belgium"
 msgstr "Бельгійскі"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Бразылія"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, fuzzy, c-format
 msgid "Canada"
 msgstr "Каляндар"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Коста-Рыка"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Чэская Рэспубліка"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Нямецкі"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, fuzzy, c-format
 msgid "Danmark"
 msgstr "Данія"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, fuzzy, c-format
 msgid "Greece"
 msgstr "Грэчаскі"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, fuzzy, c-format
 msgid "Spain"
 msgstr "Іспанскі"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Фінляндыя"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Францыя"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, fuzzy, c-format
 msgid "Israel"
 msgstr "Іўрыт"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, fuzzy, c-format
 msgid "Italy"
 msgstr "Італьянскі"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Японія"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, fuzzy, c-format
 msgid "Korea"
 msgstr "Карэйская:"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Нідэрлянды"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, fuzzy, c-format
 msgid "Norway"
 msgstr "Нарвежскі"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, fuzzy, c-format
 msgid "Poland"
 msgstr "Полька"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, fuzzy, c-format
 msgid "Portugal"
 msgstr "Партугальскі"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, fuzzy, c-format
 msgid "Russia"
 msgstr "Рускі"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, fuzzy, c-format
 msgid "Sweden"
 msgstr "Швецкі"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, fuzzy, c-format
 msgid "Taiwan"
 msgstr "Тайланд"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Злучанае Каралеўства"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Кітай"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Злучаныя Штаты"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1833,18 +1862,33 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Падрыхтоўка ўсталяваньня"
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, fuzzy, c-format
 msgid "Error during download"
 msgstr "Памылка аднаўленьня меню"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1854,12 +1898,17 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, fuzzy, c-format
 msgid "No mirror"
 msgstr "Няма мікшера"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1869,63 +1918,63 @@ msgid ""
 "by Mandrakelinux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, fuzzy, c-format
 msgid "Please choose the desired mirror."
 msgstr "калі ласка, пазначце тып вашай мышы."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, fuzzy, c-format
 msgid " done."
 msgstr "Зроблена"
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, fuzzy, c-format
 msgid " failed!"
 msgstr "mkraid не працаздольны"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, fuzzy, c-format
 msgid "Error retrieving packages"
 msgstr "Атрымалася памылка ўпарадкавання пакетаў:"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -1936,17 +1985,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
 msgstr "Пазначце карыстальнікаў каб аб'яднаць у гэтыю групу"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, fuzzy, c-format
 msgid "Update"
 msgstr "Аркады"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -1955,7 +2004,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, fuzzy, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -1963,17 +2012,17 @@ msgid ""
 "%s"
 msgstr "Немагчыма адчыніць файл %s\n"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, fuzzy, c-format
 msgid "Unable to create medium."
 msgstr "Немагчыма адчыніць файл %s\n"
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -1981,7 +2030,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2257,10 +2314,6 @@ msgstr ""
 msgid "Unknown error code %d\n"
 msgstr ""
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr ""
-
 #: data/rpmdrake.desktop.in.h:1
 #, fuzzy
 msgid "Install Software"
diff --git a/po/bg.po b/po/bg.po
index c633882d..c817c127 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-bg\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-01-11 15:00+0200\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -60,7 +60,7 @@ msgstr "Преместваемо устройство"
 msgid "Path or mount point:"
 msgstr "Път или точка на монтиране:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Обновявания свързани със сигурността"
@@ -129,9 +129,9 @@ msgstr "Тип на източника:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Отказ"
@@ -140,10 +140,10 @@ msgstr "Отказ"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Добре"
@@ -332,8 +332,8 @@ msgstr "Лимит на източници"
 msgid "Command"
 msgstr "Команда"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(няма)"
@@ -423,7 +423,7 @@ msgstr "Обновяване на източниците"
 msgid "Regenerate hdlist"
 msgstr "Обновяване на hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Моля, изчакайте. Обновява се източник..."
@@ -519,12 +519,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "В потребителски режим"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -535,570 +535,570 @@ msgstr ""
 "Няма да имате права да правите промени,\n"
 "все пак може да разгледате съществуващата база."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Достъпност"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Архивиране"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Резервно копиране"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Запис на дискове"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Компресия"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Друг"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Книги"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Компютърни книги"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Често задавани въпроси ( с отговори)"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Документи от вида \"Как да...\""
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Литература"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Комуникации"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Базата данни"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Разработки"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "ГНОМ и GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "КДЕ и Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Ядро"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Питон"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Редактори"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Комуникации"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Емулатори"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Инструменти за работа с файлове"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Игри"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Приключенски"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Аркадни"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "На дъска"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Карти"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Пъзели"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Спортни"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Стратегия"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Графичен работен плот"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM базирано"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "ГНОМ"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Графики"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Наблюдение"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Мултимедия"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Мрежа"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Чат"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Трансфер на файлове"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Моментни съобщения"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Е-поща"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Новини"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Отдалечен достъп"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Офис"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Издателски"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Науки"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Астрономия"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Биология"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Химия"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Компютърни науки"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Гео науки"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Математика"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Физика"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Шелове"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Звук"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Система"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Основа"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Настройка"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Зареждане"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Хардуер"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Работа с пакети"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Печатане"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Разработки"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Разработки"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Шрифтове"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Конзола"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Тип1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "Х11 битмап"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Интернационализация"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Ядро и хардуер"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Библиотеки"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Сървъри"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Терминали"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Инструменти за работа с текст"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Играчки"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Не е наличен)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Резултат от търсене"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Резултат от търсенето (няма)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Моля изчакайте, търся..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Обновим"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Възможни за добавяне"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Избрано"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Не е избрано"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Повече информация от пакет..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Моля изберете"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Един от следните пакети е необходим:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr ""
 "Моля изчакайте\n"
 "Пакетите се сортират"
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Няма обновления"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1109,28 +1109,28 @@ msgstr ""
 "обновления за инсталираните пакети,или вече сте ги \n"
 "инсталирали."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Всичко"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Повече информация"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Информация за пакетите"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Някой допълнителни пакети трябва да се изтрият"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1141,12 +1141,12 @@ msgstr ""
 "следните пакети трябва бъдат премахнати:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Някои пакети не могат да бъдат деинсталирани"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1155,7 +1155,7 @@ msgstr ""
 "Премахването на тези пакети би разбило системата ви, съжалявам:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1166,12 +1166,12 @@ msgstr ""
 "от избора сега:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Трябва допълнителни пакети"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1182,17 +1182,17 @@ msgstr ""
 "да бъдат инсталирани:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Някои пакети не могат да бъдат инсталирани"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1203,132 +1203,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Някои пакети трябва да бъдат премахнати"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Избрани: %d МБ / Свободно дисково пространство: %d МБ"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Общ размер %d МБ"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Файлове:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Списък с промени:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Източник:"
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Текущо инсталирана версия: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Име:"
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Версия: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Размер: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s КБ"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Важност: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Резюме:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Причина за обновяване: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Описание:"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Обновяванията свързани със подобрения"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Стандартни обновявания"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Мандрейклинукс избрани"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Всички пакети по азбучен ред"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Всички пакети,сортирани по група"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Всички пакети,подредени по размер"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Всички пакети, подредени по състояние на избора"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Всички пакети подредени по източник на съхранение"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Всички пакети по възможност за обновяване"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Само \"листа\",сортирани по инсталационна дата"
@@ -1358,7 +1363,7 @@ msgstr "Анулира избраното"
 msgid "Reload the packages list"
 msgstr "Презарежда списък с пакетите"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Обновяване на източниците"
@@ -1499,7 +1504,7 @@ msgstr ""
 "за софтуерни източници,за да пуснете разрешите поне един.\n"
 "Това се прави като сложите отметка на \"Разрешен\".\n"
 "\n"
-"След това рестартирайте Мандрейклинукс обновяване."
+"След това рестартирайте %s."
 
 #: ../rpmdrake:1140
 #, c-format
@@ -1519,7 +1524,7 @@ msgstr ""
 "мениджъра на софтуерни източници и добавете\n"
 "\"Източник за обновления за сигурност\" \n"
 "\n"
-"След това рестартирайте Мандрейклинукс Обновяване"
+"След това рестартирайте %s"
 
 #: ../rpmdrake:1170
 #, c-format
@@ -1775,13 +1780,18 @@ msgid ""
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 msgstr ""
-"Добре дошли в Mandrakelinux Обновяване!\n"
+"Добре дошли в %s!\n"
 "\n"
 "Този инструмент ще ви помогне да изберете обновяване на вашият софтуер\n"
 "върху системата."
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1796,158 +1806,181 @@ msgstr ""
 "пакети\n"
 "вие искате да инсталирате на системата."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Изтриване на пакети"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Мандрейклинукс обновяване"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Не"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Да"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Информация..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Австрия"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Австралия"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Белгия"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Бразилия"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Коста Рика"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Чехия"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Германия"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Дания"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Гърция"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Испания"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Финландия"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Франция"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Израел"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Италия"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Япония"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Корея"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Холандия"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Норвегия"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Полша"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Португалия"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Русия"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Швеция"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Тайван"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Обединеното кралство"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Китай"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "САЩ"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Трябва да се свържа със сайта на Мандрейксофт,за да получа\n"
+"списък с огледални сървъри.Моля проверете дали в момента сте\n"
+"в интернет.\n"
+"Да продължа ли ?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1960,19 +1993,40 @@ msgstr ""
 "в интернет.\n"
 "Да продължа ли ?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Моля, почакайте. Изтеглям огледалните адреси от web сайта на Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 "Моля, почакайте. Изтеглям огледалните адреси от web сайта на Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Грешка при изтегляне"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Получи се грешка пи свалянето на списъка с\n"
+"огледални сървъри:\n"
+"%s\n"
+"Или имате проблем с мрежата,или Мандрейксофт в момента има\n"
+"такъв.Моля опитайте по-късно."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1987,12 +2041,17 @@ msgstr ""
 "Или имате проблем с мрежата,или Мандрейксофт в момента има\n"
 "такъв.Моля опитайте по-късно."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Няма огледален сървър"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2007,65 +2066,65 @@ msgstr ""
 "това,че процесорната ви архитектура не се поддържа\n"
 "от официалните обновления на Мандрейклинукс."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr ""
 "Моля изчакайте\n"
 "Получавам списъка с огледални сървъри"
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Копиране на файл за източник '%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Проверявам файла от източника %s..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Проверка на файла от източник %s..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " край."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " провал!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s от източник %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Започва свалянето на `%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Сваляне на '%s',оставащо време: %s,скорост: %s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Сваляне на '%s',със скорост %s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2077,17 +2136,17 @@ msgid ""
 msgstr ""
 
 # c-format
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Моля изберете източници които искате да се подновят:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Обновяване"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2100,7 +2159,7 @@ msgstr ""
 "Грешки:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2108,19 +2167,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Невъзможност за създаване на източник."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr ""
 "Моля Изчакайте\n"
 "Добавя се източник..."
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2131,7 +2190,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2397,10 +2464,6 @@ msgstr "Неразпознато кодиране на трансфера\n"
 msgid "Unknown error code %d\n"
 msgstr "Непознат код за грешка %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Мандрейклинукс обновяване"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Инсталиране на софтуер"
diff --git a/po/bn.po b/po/bn.po
index d5671380..79d96706 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake VERSION\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-08-16 15:30+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -56,7 +56,7 @@ msgstr "অপসারণযোগ্য ডিভাইস"
 msgid "Path or mount point:"
 msgstr "পাথ অথবা মাউন্ট পয়েন্ট:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "নিরাপত্তা সংক্রান্ত আপডেট"
@@ -123,9 +123,9 @@ msgstr "মাধ্যমের ধরন:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "বাতিল"
@@ -134,10 +134,10 @@ msgstr "বাতিল"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "ঠিক আছে"
@@ -319,8 +319,8 @@ msgstr "মাধ্যমের সীমা"
 msgid "Command"
 msgstr "কমান্ড"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(একটিও নয়)"
@@ -411,7 +411,7 @@ msgstr "মাধ্যম আপডেট করো"
 msgid "Regenerate hdlist"
 msgstr "hdlist পুনরায় তৈরি করো"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "মাধ্যম আপডেট করা হচ্ছে, দয়া করে অপেক্ষা করুন..."
@@ -515,12 +515,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "`%s' মাধ্যমটি সাফল্যের সাথে যোগ করা হয়েছে।"
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "ব্যবহারকারীর মোডে চলছে"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -533,579 +533,579 @@ msgstr ""
 
 # sgstr "ব্যবহারযোগ্যতা"
 # sgstr "প্রবেশাধিকার"
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "ব্যবহার যোগ্যতা"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "আর্কাইভ করা"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "ব্যাক-আপ"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "সিডি (CD) বার্ণ করা"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "কম্প্রেশন"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "বই"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "কম্পিউটার সংক্রান্ত বই"
 
 # sgstr "প্রয়োজনীয় প্রশ্নাবলী"
 # sgstr "সাধারণ প্রশ্নাবলী"
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Faqs"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "সাহিত্য"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "ক্লাস্টার"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "তথ্য সঞ্চালন"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "সারিকরন সার্ভিস"
 
 # sgstr "সংযোগ-ব্যবস্থা"
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "যোগাযোগ"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "ডাটাবেস"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "ডিভেলপমেন্ট"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "গুনোম এবং GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "জাভা (Java)"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "কেডিই (KDE) এবং Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "কার্নেল"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "এডিটর"
 
 # sgstr "সংযোগ-ব্যবস্থা"
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "শিক্ষা"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "এমুলেটর"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "ফাইল সংক্রান্ত টুল"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "খেলা"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "রোমাঞ্চ"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "আর্কেড"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "ছক"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "তাস"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "ধাঁধা"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "খেলা"
 
 # sgstr "রণচাতুর্য"
 # sgstr "পরিচালন-দক্ষতা"
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "কৌশল"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "গ্রাফিক্যাল ডেস্কটপ"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "জ্ঞানবৃদ্ধি"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM ভিত্তিক"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "গুনোম"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "কেডিই (KDE)"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "স-ফিশ"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "উইন্ডোমেকার"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "গ্রাফিক্স"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "পর্যবেক্ষণ"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "মাল্টিমিডিয়া"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "নেটওয়ার্ক করা"
 
 # আলাপন
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "আড্ডা (chat)"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "ফাইল আদানপ্রদান"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "ইনস্ট্যন্ট মেসেজ করা"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "আইআরসি (IRC)"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "মেইল"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "খবরাখবর (news)"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "দূরবর্তী প্রবেশ"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "অফিস"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "পাবলিক কীসমুহ"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "প্রকাশনা"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "বিজ্ঞান"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "জ্যোতির্বিদ্যা"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "জীববিজ্ঞান"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "রসায়ন"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "কম্পিউটার বিজ্ঞান"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "ভূবিজ্ঞানসমূহ"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "অঙ্কশাস্ত্র"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "পদার্থবিদ্যা"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "শেল"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "শব্দ"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "সিষ্টেম"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "ভিত্তি"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "কনফিগারেশন"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Boot এবং Init"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "হার্ডওয়্যার"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "প্যাকেজ করা"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "প্রিন্ট করা"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "ডিপ্লয়মেন্ট"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "ডিপ্লয়মেন্ট"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "ফন্ট"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "কনসোল"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "ট্রু টাইপ"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 বিটম্যাপ"
 
 # sgstr "অন্তর-রাষ্ট্রিয়করণ"
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "আন্তর্জাতিকীকরণ"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "কার্নেল এবং হার্ডওয়্যার"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "লাইব্রেরি"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "সার্ভার"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "টার্মিন্যাল"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "টেক্সট সংক্রান্ত টুল"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "খেলনা"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "ভিডিও"
 
 # উপলব্ধ 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(নেই)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "অনুসন্ধানের ফলাফল"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "অনুসন্ধানের ফলাফল (শূন্য)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "অনুসন্ধান করা হচ্ছে, দয়া করে অপেক্ষা করুন..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "থামো"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "আপগ্রেডযোগ্য"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "যোগ করা সম্ভব"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "নির্বাচিত"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "নির্বাচিত নয়"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
 # অতিরিক্ত
 # বিস্তারিত
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "প্যাকেজ সমন্ধে আরো তথ্য..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "দয়া করে নির্বাচন করুন"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "নিম্নোক্ত প্যাকেজগুলোর মধ্যে একটির প্রয়োজন আছে:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "প্যাকেজের তালিকা তৈরি করা হচ্ছে, দয়া করে অপেক্ষা করুন..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "কোন আপডেট নেই"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1116,30 +1116,30 @@ msgstr ""
 "আপনার কম্পিউটারে ইনষ্টল করা প্যাকেজগুলোর জন্য কোন আপডেট\n"
 "উপস্থিত নেই অথবা আপনি ইতিমধ্যাই  আপডেটগুলোকে ইনষ্টল করে নিয়েছেন।"
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, 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:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "অতিরিক্ত তথ্য"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "প্যাকেজ সম্বন্ধিয় তথ্য"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "কিছু বাড়তি প্যাকেজ মুছে ফেলা প্রয়োজন"
 
 # যোগসুত্রের
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1150,12 +1150,12 @@ msgstr ""
 "হবে:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "কিছু প্যাকেজ মুছে ফেলা সম্ভব নয়"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1165,7 +1165,7 @@ msgstr ""
 "\n"
 
 # ডিপেন্ডেনসির
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1176,12 +1176,12 @@ msgstr ""
 "এখনই বাদ দিতে হবে:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "অতিরিক্ত প্যাকেজের প্রয়োজন আছে"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1192,17 +1192,17 @@ msgstr ""
 "হবে:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (বাতিল তালিকায় উপস্হিত)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "কিছু প্যাকেজ ইনষ্টল করা সম্ভব নয়"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1213,136 +1213,141 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "কিছু প্যাকেজ সরিয়ে ফেলতে হবে"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "নির্বাচিত: %d মেগাবাইট / ডিস্কে ফাঁকা জায়গা: %d মেগাবাইট"
 
 # মাপ
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "নির্বাচিত আকার: %d মেগাবাইট"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "এই প্যাকেজের বিস্তারিত বর্ণনা উপস্হিত নেই\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "ফাইল:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "পরিবর্তনলিপি:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "মাধ্যম: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "বর্তমানে ইনষ্টল করা ভার্সান: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "নাম: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "ভার্সান: "
 
 # মাপ
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "আকার: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s কিলোবাইট"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "গুরুত্ত্ব: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "সারাংশ:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "আপডেট করার কারন: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "বিবরণ: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "বাগফিক্সসমূহের (Bugfixes) আপডেট"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "সাধারণ আপ-ডেট"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux এর পছন্দতালিকা"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "সকল প্যাকেজ, প্রথম অক্ষর অনুযায়ী"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "সকল প্যাকেজ, দল অনুযায়ী"
 
 # মাপ
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "সকল প্যাকেজ, আকার অনুযায়ী"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "সকল প্যাকেজ, নির্বাচনের অবস্থা অনুযায়ী"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "সকল প্যাকেজ, অবস্থানের মাধ্যম অনুযায়ী"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "সকল প্যাকেজ, আপডেট অনুযায়ী"
 
 # শুধুমাত্র পল্লব
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "শুধু Leaves, ইনষ্টল তারিখের ক্রমে সাজানো"
@@ -1372,7 +1377,7 @@ msgstr "বাছাই করাগুলোকে পূর্বাবস্�
 msgid "Reload the packages list"
 msgstr "প্যাকেজের তালিকা পুনরায় লোড করো"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "মাধ্যম আপডেট করো"
@@ -1791,6 +1796,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1804,158 +1814,182 @@ msgstr ""
 "বেশি সংখ্যক সফ্টওয়্যার উপস্থিত থাকে। যে সফ্টওয়্যারগুলো আপনার কম্পিউটারে\n"
 "ইনষ্টল করতে আপনি ইচ্ছুক, সেগুলোকে এই টুলের দ্বারা নির্বাচন করতে পারবেন।"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "সফটওয়্যার প্যাকেজ আপডেট"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "না"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "হ্যাঁ"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "তথ্য..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "অস্ট্রিয়া"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "অস্ট্রেলিয়া"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "বেলজিয়াম"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "ব্রাজিল"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "কানাডা"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "কস্টা রিকা"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "চেক প্রজাতন্ত্র"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "জার্মানি"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "ডেনমার্ক"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "গ্রীস"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "স্পেন"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "ফিনল্যান্ড"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "ফ্রাঁন্স"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "ইজরায়েল"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "ইটালি"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "জাপান"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "কোরিয়া"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "নেদারল্যান্ড"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "নরওয়ে"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "পোল্যান্ড"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "পর্তুগাল"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "রাশিয়া"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "সুইডেন"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "তাইওয়ান"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "যুক্তরাজ্য"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "চীন"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "যুক্তরাষ্ট্র"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"মিররের তালিকা পাওয়ার জন্য আমাকে Mandrakesoft-এর ওয়েবসাইটের সাথে সংযোগ করতে "
+"হবে।\n"
+"দয়া করে পরীক্ষা করুন আপনার নেটওয়ার্ক বর্তমানে চলছে কিনা।\n"
+"\n"
+"অগ্রসর হওয়া যাবে কি?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1969,7 +2003,14 @@ msgstr ""
 "\n"
 "অগ্রসর হওয়া যাবে কি?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Mandrakesoft-এর ওয়েবসাইট থেকে মিররের ঠিকানা ডাউনলোড করা হচ্ছে, দয়া করে "
+"অপেক্ষা  করুন।"
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
@@ -1977,12 +2018,27 @@ msgstr ""
 "Mandrakesoft-এর ওয়েবসাইট থেকে মিররের ঠিকানা ডাউনলোড করা হচ্ছে, দয়া করে "
 "অপেক্ষা  করুন।"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "ডাউনলোডের সময় সমস্যা হয়েছে"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"মিররের তালিকা ডাউনলোড করতে সমস্যা হয়েছে:\n"
+"\n"
+"%s\n"
+"Mandrakesoft-এর ওয়েবসাইট অথবা নেটওয়ার্কটি সম্ভবত বর্তমানে উপস্হিত নয়,\n"
+"দয়া করে কিছুক্ষণ পরে পুনরায় চেষ্টা করুন।"
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1997,12 +2053,17 @@ msgstr ""
 "Mandrakesoft-এর ওয়েবসাইট অথবা নেটওয়ার্কটি সম্ভবত বর্তমানে উপস্হিত নয়,\n"
 "দয়া করে কিছুক্ষণ পরে পুনরায় চেষ্টা করুন।"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "কোন মিরর নেই"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2017,64 +2078,64 @@ msgstr ""
 "আপনার সিষ্টেমের প্রসেসরের আর্কিটেকচার Mandrakelinux Official\n"
 "Updates -এর দ্বারা সমর্থন করে না।"
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "আকাঙ্ক্ষিত মিররটি নির্বাচন করুন।"
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' মাধ্যমের জন্য ফাইল কপি  করা হচ্ছে..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "`%s' মাধ্যমের জন্য ফাইল পরীক্ষা করা হচ্ছে..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "`%s' মাধ্যমের জন্য দূরবর্তী ফাইল পরীক্ষা করা হচ্ছে..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " সম্পন্ন।"
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, 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:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s, %s মাধ্যম থেকে"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "`%s' এর ডাউনলোড আরম্ভ করা হয়েছে..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s'-এর ডাউনলোড, অবশিষ্ট সময়:%s, গতি:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' এর ডাউনলোড, গতি: %s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "প্যাকেজ আহরণ করতে সমস্যা হয়েছে"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2091,17 +2152,17 @@ msgstr ""
 "যোগ করতে হবে। এটি সম্ভবত বর্তমানে উপস্হিত নয় এবং\n"
 "আপনাকে কিছুক্ষণ পরে আবার চেষ্টা করতে হবে।"
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "যে মাধ্যমটি আপনি আপ-ডেট করতে ইচ্ছুক তা নির্বাচন করুন:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "আপডেট"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2114,7 +2175,7 @@ msgstr ""
 "ত্রুটিসমুহ:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2125,17 +2186,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "মাধ্যম তৈরি করা যায়নি"
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "মাধ্যম যোগ করার প্রক্রিয়া বিফল হয়েছে"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2146,7 +2207,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"আপনার মাধ্যম `%s', আপডেট এর জন্য ব্যবহৃত হত, তা আপনার চালানো Mandrakelinux (%s) "
+"এর সাথে মিলছে নাহ্।\n"
+"একে নিষ্ক্রয় করা হবে।"
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2416,10 +2488,6 @@ msgstr "অপরিচিত আদান-প্রদানের এনকো
 msgid "Unknown error code %d\n"
 msgstr "অজানা সমস্যার কোড %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "সফ্টওয়্যার ইনষ্টল করো"
diff --git a/po/br.po b/po/br.po
index 48c129f3..a745d7c3 100644
--- a/po/br.po
+++ b/po/br.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-09-22 23:57+0200\n"
 "Last-Translator: Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>\n"
 "Language-Team: Brezhoneg <ofisk.bzh@wanadoo.fr>\n"
@@ -58,7 +58,7 @@ msgstr "Trobarzhell lem-laka"
 msgid "Path or mount point:"
 msgstr "Hent pe poent marc'hañ :"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Bremanaat surentez"
@@ -123,9 +123,9 @@ msgstr "Seurt ar medium :"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Nullañ"
@@ -134,10 +134,10 @@ msgstr "Nullañ"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Mat eo"
@@ -316,8 +316,8 @@ msgstr ""
 msgid "Command"
 msgstr "Kanadian (Kebek)"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(hini ebet)"
@@ -404,7 +404,7 @@ msgstr "Bremanaat ar medium"
 msgid "Regenerate hdlist"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Gortozit mar plij, o bremanaat ar media ..."
@@ -493,12 +493,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -506,568 +506,568 @@ msgid ""
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Haezadusted"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Diellerezh"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Saveteiñ"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Engravañ CDoù"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Gwaskerezh"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "All"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Levrioù"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Levrioù an urzhiater"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "FAQoù"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Lennegezh"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Kehentiñ"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Stlennvonioù"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Programmadur"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME ha KDE"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE ha Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kalonenn"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Aozerien"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Deskadurezh"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Kendarvanerezh"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Binvioù restr"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "C'Hoarioù"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Troioù-kaer"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "C'hoarioù tavarn"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Kartennoù"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kartenn"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Mildammoù"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sportoù"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Kadouriezh"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Burev c'hrafek"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafek"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Evezhiañ"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Liesvedia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Rouedad"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Flapañ"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Treuzkas restroù"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, fuzzy, c-format
 msgid "Instant messaging"
 msgstr "Rouedad/Mavegoù"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Mailh"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Keleier"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Diraez a-bell"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "Gwiad bedel"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Burev"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Alc'hwezioù foran"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Embann"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Skiantoù"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Steredoniezh"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Bioloji"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Chimi"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Urzhiata<"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Jeoloji"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematikoù"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fisik"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Shelloù"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Son"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Reizhad"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Sol"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Kefluniadur"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Loc'hañ ha deraouekaat"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Periantel"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Ober pakadoù"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "War voulañ"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Programmadur"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Programmadur"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Nodrezhoù"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Letrin"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "Bitmap X11"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Etrebroadeladur"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Levraouegoù"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Servijerien"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Termenelloù"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Binvioù skrid"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "C'hoarielloù"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Hegerz ebet)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, fuzzy, c-format
 msgid "Search results"
 msgstr "Servijer DNS"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, fuzzy, c-format
 msgid "Search results (none)"
 msgstr "Klask"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Gortozit mar plij, o klask ..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Harpañ"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Bremanaet"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, fuzzy, c-format
 msgid "Addable"
 msgstr "Taolenn"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Diuzet"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Andiuzet"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, fuzzy, c-format
 msgid "More information on package..."
 msgstr "O klask ar pakadoù hegerz"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Dibabit, mar plij"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, fuzzy, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet/lamet"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, fuzzy, c-format
 msgid "Please wait, listing packages..."
 msgstr "Gortozit e-keit ha ma kerc'han roll ar pakadoù bremanaet, mar plij..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, fuzzy, c-format
 msgid "No update"
 msgstr "N'eus ket bremanaat"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1075,28 +1075,28 @@ msgid ""
 "or you already installed all of them."
 msgstr ""
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Holl"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Keleier war ar pakad"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, fuzzy, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet/lamet"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1104,19 +1104,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, fuzzy, c-format
 msgid "Some packages can't be removed"
 msgstr "Ne m'eus ket gallet staliañ pakad"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1124,12 +1124,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1137,17 +1137,17 @@ msgid ""
 "\n"
 msgstr "Ar pakadoù a-heul a zo war-nes bezañ distaliet"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Ne m'eus ket gallet staliañ pakadoù bennak"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, fuzzy, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1155,132 +1155,137 @@ msgid ""
 "%s"
 msgstr "Ar pakadoù a-heul a zo war-nes bezañ distaliet"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, fuzzy, c-format
 msgid "Some packages need to be removed"
 msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet/lamet"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Diuzet : %d Mo / egor dieub ar bladenn : %d Mo"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Ment diuzet : %d Mo"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Restroù :\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Kemmoù :\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Anv : "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Doare : "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Ment : "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s Ko"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Talvoudegezh : "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Diverrañ : "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Deskrivadur : "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, fuzzy, c-format
 msgid "Normal updates"
 msgstr "Bremanaat Mandrakelinux"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, fuzzy, c-format
 msgid "Mandrakelinux choices"
 msgstr "MandrakeConsulting"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Pakadoù holl (gant anv)"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Pakadoù holl (gant strollad)"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Pakadoù holl (gant ment)"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, fuzzy, c-format
 msgid "All packages, by selection state"
 msgstr "Pakadoù holl (gant deiziad)"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, fuzzy, c-format
 msgid "All packages, by medium repository"
 msgstr " Pakadoù holl "
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
@@ -1310,7 +1315,7 @@ msgstr "Diuz pakadoù unan hag unan"
 msgid "Reload the packages list"
 msgstr "Bremanaat pakadoù hep ken"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Bremanaat ar media"
@@ -1681,6 +1686,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1689,158 +1699,177 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Anv rannet"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Bremañaat Mandrakelinux"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "N'eo ket"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Ya"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, fuzzy, c-format
 msgid "Info..."
 msgstr "Titouroù"
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Aostria"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australi"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Beljik"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Republik Tchek"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Alamagn"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Gres"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Spagn"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Gall"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Itali"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japon"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Kore"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Izelvroioù"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norvej"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Pologn"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rusi"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Sued"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taeihlwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Rouantelezh Unanet"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Sina"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Amerika"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1849,18 +1878,33 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Gortozit mar plij, o bremanaat ar media ..."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1870,12 +1914,17 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "N'eo ket melezou"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1885,63 +1934,63 @@ msgid ""
 "by Mandrakelinux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Dibabit ar melezour c'hoantet."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " graet."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr "sac'het!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -1952,17 +2001,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr ""
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Bremañaat"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -1971,7 +2020,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -1979,17 +2028,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -1997,7 +2046,15 @@ msgid ""
 "%s"
 msgstr "Kudennoù ho staliadur"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2264,10 +2321,6 @@ msgstr ""
 msgid "Unknown error code %d\n"
 msgstr ""
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Bremañaat Mandrakelinux"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Staliañ Poelladoù"
diff --git a/po/bs.po b/po/bs.po
index 31b0e8e9..8f77aa47 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-bs\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-08-15 12:33+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosanski <lokal@lugbih.org>\n"
@@ -58,7 +58,7 @@ msgstr "Izmjenjivi uređaj"
 msgid "Path or mount point:"
 msgstr "Put ili tačka montiranja:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Sigurnosna unaprjeđenja"
@@ -125,9 +125,9 @@ msgstr "Tip medija:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
@@ -136,10 +136,10 @@ msgstr "Odustani"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "U redu"
@@ -320,8 +320,8 @@ msgstr "Ograničenje medija"
 msgid "Command"
 msgstr "Naredba"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(nije instaliran)"
@@ -410,7 +410,7 @@ msgstr "Unaprijedi medij"
 msgid "Regenerate hdlist"
 msgstr "Regeneriši hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Molim sačekajte, osvježavam medije..."
@@ -511,12 +511,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Uspješno dodan medij `%s'."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Radim u korisničkom modu"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -527,568 +527,568 @@ msgstr ""
 "Nećete moći vršiti izmjene na sistemu, ali i dalje možete\n"
 "pregledati postojeću bazu podataka."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Pristupačnost"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Arhiviranje"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "CD prženje"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Kompresija"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Ostalo"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Knjige"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Računarske knjige"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "FAQovi"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howto-ovi"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Književnost"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "Prosljeđivanje poruka"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "Queueing usluge"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Komunikacije"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Baze podataka"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Programiranje"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME i GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE i Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Editori"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Obrazovanje"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Simulatori"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Alati za datoteke"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Igre"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Avanture"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arkadne igre"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Tabla"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Karte"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Zagonetke"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategija"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Grafički desktop"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM baziran"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Nadzor"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedija"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Mreža"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Prijenos podataka"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Instant poruke"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "E-mail"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Udaljeni pristup"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Ured"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Javni ključevi"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Izdavaštvo"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Nauke"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomija"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologija"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Hemija"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Računarske nauke"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geonauke"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Zvuk"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sistem"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Osnovno"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Podešavanje"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Pokretanje i inicijalizacija"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Pakiranje"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Štampanje"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "Deploiement"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Deploiement"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Fontovi"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konzola"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmapa"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Internacionalizacija"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel i hardware"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Biblioteke"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Serveri"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminali"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Tekst alati"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Igračke"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Nijedan nije dostupan)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Rezultati pretrage"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Rezultati pretrage (ništa)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Molim sačekajte, tražim..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Stani"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Može se unaprijediti"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Može se dodati"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Izabrano"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Nije izabrano"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Više informacija o paketu..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Molim izaberite"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Potreban je jedan od sljedećih paketa:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Molim sačekajte, listam pakete..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Nema update-a"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1099,28 +1099,28 @@ msgstr ""
 "za pakete koji su instalirani na vašem računaru, ili da ste ih\n"
 "već instalirali."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Sve"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Više informacija"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Informacije o paketima"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Potrebno je obrisati neke dodatne pakete"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1131,12 +1131,12 @@ msgstr ""
 "deinstalirati:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Neke pakete se ne može deinstalirati"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1145,7 +1145,7 @@ msgstr ""
 "Uklanjanje ovog paketa bi izazvalo rušenje sistema:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1156,12 +1156,12 @@ msgstr ""
 "izbaciti sa liste izabranih:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Potrebni su dodatni paketi"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1172,17 +1172,17 @@ msgstr ""
 "instalirati:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (pripada listi za preskakanje)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Neki paketi se ne mogu instalirati"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1193,132 +1193,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Neke pakete treba obrisati"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Izabrano: %d MB / Slobodan prostor: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Veličina izabranog: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Opis nije dostupan za ovaj paket\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Datoteke:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Medij: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Trenutno instalirana verzija: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Verzija: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Veličina: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Značaj: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Sažetak: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Razlog za update: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Opis: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Ispravke bugova"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Normalni update-i"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux izbori"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Svi paketi, abecedno"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Svi paketi, po grupi"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Svi paketi, po veličini"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Svi paketi, po stanju izabranosti"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Svi paketi, po spremištu medija"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Svi paketi, po dostupnosti update-a"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Samo listovi, sortirani po datumu instalacije"
@@ -1348,7 +1353,7 @@ msgstr "Poništi izbor"
 msgid "Reload the packages list"
 msgstr "Ponovo učitaj listu paketa"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Osvježi medij"
@@ -1763,6 +1768,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1776,158 +1786,181 @@ 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:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Ažuriranje softverskih paketa"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Da"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australija"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Češka"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Njemačka"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Danska"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grčka"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Španija"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finska"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Francuska"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Italija"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Koreja"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Nizozemska"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Švedska"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Ujedinjeno Kraljevstvo"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "SAD"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Sada je potrebno kontaktirati Mandrakesoft stranicu kako bismo dobili\n"
+"listu mirrora. Molim provjerite da li je vaša mreža trenutno u funkciji.\n"
+"\n"
+"Mogu li nastaviti?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1940,18 +1973,38 @@ msgstr ""
 "\n"
 "Mogu li nastaviti?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Molim sačekajte, skidam adrese mirrora sa Mandrakesoft web stranice."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Molim sačekajte, skidam adrese mirrora sa Mandrakesoft web stranice."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Greška prilikom downloada"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Došlo je do greške prilikom skidanja liste mirrora:\n"
+"\n"
+"%s\n"
+"Mreža ili Mandrakesoft web stranica su možda nedostupni.\n"
+"Molim probajte ponovo kasnije."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1966,12 +2019,17 @@ msgstr ""
 "Mreža ili Mandrakesoft web stranica su možda nedostupni.\n"
 "Molim probajte ponovo kasnije."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Nema mirrora"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1986,63 +2044,63 @@ msgstr ""
 "arhitektura vašeg procesora nije podržana od strane Mandrakelinux\n"
 "oficijelnih update-a."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Molimo izaberite željeni mirror"
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopiram datoteku za medij '%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Ispitujem datoteku medija '%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Ispitujem udaljenu datoteku medija '%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " završeno."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " nije uspjelo!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s sa medija %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Započinjem download '%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download '%s', preostalo:%s, brzina:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download '%s', brzina:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Greška pri dobavljanju paketa"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2058,17 +2116,17 @@ msgstr ""
 "biste ga rekonfigurisali; ili je medij trenutno nedostupan i trebate\n"
 "pokušati ponovo kasnije."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Izaberite medije koje želite unaprijediti:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Update"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2081,7 +2139,7 @@ msgstr ""
 "Greške:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2092,17 +2150,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Ne mogu kreirati medij."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Neuspjeh u dodavanju medija"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2113,7 +2171,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"Vaš medij za ažuriranje `%s' ne odgovara verziji Mandrakelinuxa koju "
+"trenutno koristite (%s).\n"
+"Medij će biti isključen."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2382,10 +2451,6 @@ msgstr "Prenosno kodiranje nije prepoznato\n"
 msgid "Unknown error code %d\n"
 msgstr "Nepoznat kod greške %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Instaliraj softver"
diff --git a/po/ca.po b/po/ca.po
index 4edeff24..17856c6c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-10-03 23:17+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -59,7 +59,7 @@ msgstr "Dispositius extraïbles"
 msgid "Path or mount point:"
 msgstr "Camí o punt de muntatge:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "actualitzacions de seguretat"
@@ -126,9 +126,9 @@ msgstr "Tipus de font: "
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Cancel·la"
@@ -137,10 +137,10 @@ msgstr "Cancel·la"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "D'acord"
@@ -187,7 +187,8 @@ msgstr "Heu d'inserir la font per a continuar"
 
 #: ../edit-urpm-sources.pl:248
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "Per tal de desar els canvis, heu d'inserir al font en la unitat."
 
 #: ../edit-urpm-sources.pl:268
@@ -322,8 +323,8 @@ msgstr "Límit de Medis"
 msgid "Command"
 msgstr "Ordre"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(cap)"
@@ -414,7 +415,7 @@ msgstr "Actualitza la(es) font(s) "
 msgid "Regenerate hdlist"
 msgstr "Regenerar hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Si us plau espereu, actualitzant dades..."
@@ -451,8 +452,10 @@ msgstr "Ajuda executada."
 
 #: ../edit-urpm-sources.pl:730 ../rpmdrake:1053
 #, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
-msgstr "La finestra de ajuda s'ha obert. En poc temps sortira en el seu escritori."
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
+msgstr ""
+"La finestra de ajuda s'ha obert. En poc temps sortira en el seu escritori."
 
 #: ../edit-urpm-sources.pl:741 ../gurpmi.addmedia:75 ../rpmdrake:1579
 #, c-format
@@ -516,12 +519,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "S'ha afegit la font `%s' amb èxit."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Funcionant en mode usuari"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -532,570 +535,570 @@ msgstr ""
 "No serà permés fer modificacions al sistema,\n"
 "però li serà possible examinar la base de dades existent."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Accessibilitat"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Arxivant"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Resguard"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Creació de Cd's"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Compressió"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Altres"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Llibres"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Llibres/Informàtica "
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Preguntes més freqüents"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Com es fa...?"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "Pas de missatges"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Comunicacions"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Bases de dades"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Desenvolupament"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "Gnome i GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE i QT"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Nucli"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl "
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Editors"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Educació"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emuladors"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Eines de fitxers"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Jocs"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Aventura"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Jocs/Taula "
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Cartes"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Trencaclosques"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Esports"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Estratègia"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Escriptori gràfic/KDE "
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "Basat a FVWM"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Peix serra"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Gràfics"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Monitorització"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimèdia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Xarxa"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Xat"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "transferència de fitxers "
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Missatgeria instantània"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Correu electrònic "
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Noticies"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Accés remot"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Oficina"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Claus públiques"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Publicació"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Ciències"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomia"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Ciències/Biologia "
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Química"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Ordinador científic"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geo ciències"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Ciències/Matemàtiques "
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Física"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Intèrprets d'ordres "
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "So"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sistema"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Configuració"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Arrancada e Inici"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Maquinari "
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Empaquetat"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Imprimint"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr ""
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr ""
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Fonts "
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Consola"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Tipus1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "Sistema/Fonts/X11 bitmap "
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Sistema/Internacionalització "
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Nucli i maquinari"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Biblioteques"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Servidors"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminals "
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Eines de text"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Joguines"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(No disponible)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Resultats de la cerca"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Resultats de la cerca (cap)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Si us plau espereu, s'està buscant..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Para"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Actualitzable"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Afegible"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Seleccionat"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "No seleccionat"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Més informació del paquet..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Si us plau escolliu"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Es necessita un dels següents paquets:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr ""
 "Si us plau, espereu\n"
 "S'estan ordenant els paquets "
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "No hi han actualitzacions"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1107,28 +1110,28 @@ msgstr ""
 "ordinador,\n"
 "o que ja els heu instal·lat tots."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Tot"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Més informació"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Informació en els paquets"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Cal esborrar paquets addicionals"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1138,12 +1141,12 @@ msgstr ""
 "Per poder satisfer totes les dependències, els següent(s) paquet(s)\n"
 "cal que s'eliminin:\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Alguns paquets no poden ser esborrats"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1152,7 +1155,7 @@ msgstr ""
 "Suprimir aquests paquets faria mal bé el sistema, disculpau:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1164,12 +1167,12 @@ msgstr ""
 "ara:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Es necessiten paquets addicionals"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1180,17 +1183,17 @@ msgstr ""
 "paquet(s):\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Alguns paquets no poder ser instal·lats"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1201,132 +1204,137 @@ msgstr ""
 "\n"
 "%s "
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "S'han d'eliminar alguns paquets"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seleccionats: %d MB / Espai lliure en disc: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Espai Seleccionat %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "La descripció d'aquest paquet no està disponible\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Fitxer:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Font:"
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Versió actualment instal·lada: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Nom: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Versió: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Mida "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Importància:"
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Resum "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Raó d'actualització: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Descripcions: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "actualització i reparació d'errors"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Actualitzacions normals "
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Opcions de Mandrakelinux"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Tots els paquets, alfabèticament"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Tots els paquets, per grup"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Tots els paquets, per tamany"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Tots els paquets per estat de selecció"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Tots els paquets, per dipòsit de fonts"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Tots els paquets, amb actualització."
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Ordenant per data de instal·lació."
@@ -1356,7 +1364,7 @@ msgstr "Esborra la selecció"
 msgid "Reload the packages list"
 msgstr "Recarrega la llista de paquets"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Actualitza la(es) font(s) "
@@ -1496,7 +1504,7 @@ msgstr ""
 "de fonts de programari per a activar al menys una. (Comproveu-ho en la "
 "columna Activat?)\n"
 "\n"
-"Després reinicieu la Actualització de Mandrakelinux."
+"Després reinicieu la %s."
 
 #: ../rpmdrake:1140
 #, c-format
@@ -1782,6 +1790,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1796,158 +1809,182 @@ msgstr ""
 "programari\n"
 "voleu instal·lar en el vostre ordinador."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Actualització de Paquets de Programari"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Actualització del Mandrakelinux"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "No"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Sí"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Informacions "
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Àustria"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Austràlia"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Bèlgica"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Canadà"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "República Txeca"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Alemanya"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Dinamarca"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grècia"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Espanya"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finlàndia"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "França"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israel "
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Itàlica"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japó"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Paísos Baixos"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Polònia"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rússia"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Suècia"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Regne Unit"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Xina"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Estats Units"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Necessito contactar amb la pàgina web de Mandrakesoft per a baixar la llista "
+"de rèpliques.\n"
+"Comproveu per favor que la vostra xarxa funcioni.\n"
+"\n"
+"Esteu d'acord en continuar?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1961,19 +1998,42 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Per favor espereu, baixant les adreces de les rèpliques des de la web de "
+"Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
-msgid "Please wait, downloading mirror addresses from the Mandrakesoft website."
+msgid ""
+"Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 "Per favor espereu, baixant les adreces de les rèpliques des de la web de "
 "Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "S'ha produït un error durant la descàrrega"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Hi ha hagut un error baixant la llista de rèpliques:\n"
+"\n"
+"%s\n"
+"La xarxa, o la web de Mandrakesoft, deuen ser inaccessibles.\n"
+"Per favor, proveu-ho més tard."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1988,12 +2048,17 @@ msgstr ""
 "La xarxa, o la web de Mandrakesoft, deuen ser inaccessibles.\n"
 "Per favor, proveu-ho més tard."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "sense rèplica"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2008,63 +2073,63 @@ msgstr ""
 "quan l'arquitectura del seu processador no és suportada \n"
 "per Mandrakelinux Official Updates."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Si us plau, seleccioneu una rèplica desitjada."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copiant fitxer per a la font %s "
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Examinant el fitxer de fonts %s... "
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Examinant el fitxer remot de fonts %s..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr "Fet"
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " Error!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s de la font %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Començant la baixada de %s' ..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, 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:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Baixada de %s, velocitat: %s "
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Error al recuperar els paquets"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2075,17 +2140,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Seleccioneu la(es) font(s) que voleu actualitzar: "
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Actualitza"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2098,7 +2163,7 @@ msgstr ""
 "Errors:\n"
 "%s "
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2109,17 +2174,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "No es pot crear la font."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Fallada al afegir una font"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2130,7 +2195,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2396,10 +2469,6 @@ msgstr "No s'ha reconegut la codificació de transferència\n"
 msgid "Unknown error code %d\n"
 msgstr "Codi d'error desconegut %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Actualització del Mandrakelinux"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Instal·lació de programari"
@@ -2414,4 +2483,3 @@ msgstr "Gestor de Fonts del Programari"
 
 #~ msgid "Mandrake Update"
 #~ msgstr "Actualització del Mandrake"
-
diff --git a/po/cs.po b/po/cs.po
index 6c8f8a7d..115044e6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-cs\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-08-19 22:24+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -63,7 +63,7 @@ msgstr "Vyjímatelné zařízení"
 msgid "Path or mount point:"
 msgstr "Cesta nebo přípojný bod:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Bezpečnostní aktualizace"
@@ -130,9 +130,9 @@ msgstr "Typ zdroje:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Zrušit"
@@ -141,10 +141,10 @@ msgstr "Zrušit"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -325,8 +325,8 @@ msgstr "Omezení zdrojů"
 msgid "Command"
 msgstr "Příkaz"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(žádná)"
@@ -415,7 +415,7 @@ msgstr "Aktualizovat zdroj"
 msgid "Regenerate hdlist"
 msgstr "Přegenerovat hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Prosím počkejte, aktualizuji zdroje..."
@@ -517,12 +517,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Zdroj `%s' byl úspěšně přidán."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Běh v uživatelském režimu"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -533,568 +533,568 @@ msgstr ""
 "Nebudete moci provádět úpravy vašeho systému,\n"
 "můžete však prohlížet vaši stávající databázi."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Zpřístupnění"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Archivování"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Zálohování"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Vypalování CD"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Komprimace"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Jiné"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Knihy"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Počítačová literatura"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Často kladené otázky"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Návody"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "Předávání zpráv"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "Služby frontování"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Komunikace"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Databáze"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Vývoj"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME a GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE a Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Jádro"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Editory"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Vzdělávání"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulátory"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Souborové nástroje"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Hry"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Dobrodružné"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arkády"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Stolní hry"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Karty"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Hlavolamy"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sporty"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategie"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Grafické prostředí"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "Založené na FVWM"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "IceWM"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Sledování"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimédia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Sítě"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Přenos souboru"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Okamžitá výměna zpráv"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Pošta"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Diskusní skupiny"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Vzdálený přístup"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Kancelář"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Veřejné klíče"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Publikování"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Vědy"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomie"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologie"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Chemie"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Počítačová věda"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geovědy"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fyzika"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Shelly"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Zvuk"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Systém"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Základ"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Nastavení"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Zavádění a inicializace"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Balíčky"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Tisk"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "Nasazení"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Nasazení"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Písma"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konzole"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "Bitmapa X11"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Internacionalizace"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Jádro a hardware"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Knihovny"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Servery"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminály"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Textové nástroje"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Hračky"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Není k dispozici)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Výsledky hledání"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Výsledky hledání (žádné)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Prosím počkejte, hledám..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Stop"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Lze aktualizovat"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Lze přidat"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Vybraný"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Nevybrán"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Více informací o balíčku..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Prosím vyberte"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Je třeba jeden z následujících balíčků:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Prosím počkejte, vypisuji balíčky..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Žádná aktualizace"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1105,28 +1105,28 @@ msgstr ""
 "žádné aktualizace pro balíčky instalované na vašem počítači, nebo už\n"
 "máte všechny aktualizace nainstalované."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Vše"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Více informací"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Informace o balíčcích"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Je třeba odstranit některé další balíčky"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1137,12 +1137,12 @@ msgstr ""
 "balíčky:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Některé balíčky nelze odstranit"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1151,7 +1151,7 @@ msgstr ""
 "Odstranění těchto balíčků by poškodilo váš systém, omlouváme se:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1162,12 +1162,12 @@ msgstr ""
 "balíčků:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Jsou potřeba další balíčky"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1178,17 +1178,17 @@ msgstr ""
 "balíčky:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (patří do přeskakovaných)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Některé balíčky nelze nainstalovat"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1199,132 +1199,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Některé balíčky musí být odebrány"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Vybráno: %d MB / Volné místo na disku: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Velikost výběru: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Popis tohoto balíčku není k dispozici\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Soubory:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Změny:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Zdroj: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Nyní nainstalovaná verze: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Název: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Verze: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Velikost: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s kB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Důležitost: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Shrnutí: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Důvod pro aktualizaci: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Popis: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Opravy chyb"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Běžné aktualizace"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Volby Mandrakelinux"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Všechny balíčky, abecedně"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Všechny balíčky, podle skupiny"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Všechny balíčky, podle velikosti"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Všechny balíčky, podle stavu výběru"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Všechny balíčky, podle umístění zdroje"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Všechny balíčky, podle dostupnosti aktualizace"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Pouze listy, tříděné podle data instalace"
@@ -1354,7 +1359,7 @@ msgstr "Nulovat výběr"
 msgid "Reload the packages list"
 msgstr "Znovu načíst seznam balíčků"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Aktualizovat zdroje"
@@ -1762,13 +1767,18 @@ msgid ""
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 msgstr ""
-"Vítejte v aplikaci Mandrakelinux Update!\n"
+"Vítejte v aplikaci %s!\n"
 "\n"
 "Tento nástroj vám pomůže vybrat aktualizace, které chcete instalovat na\n"
 "vašem počítači."
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1783,158 +1793,181 @@ msgstr ""
 "na CD-ROM nebo DVD. Tento nástroj vám pomůže vybrat, který software\n"
 "chcete na svém počítači nainstalovat."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Aktualizace balíčků software"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Ano"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Informace..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Rakousko"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Austrálie"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgie"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brazílie"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Česká republika"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Německo"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Dánsko"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Řecko"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Španělsko"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finsko"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Francie"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Itálie"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japonsko"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Nizozemí"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norsko"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Polsko"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugalsko"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rusko"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Velká Británie"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Čína"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Spojené státy"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Je třeba kontaktovat webové stránky společnosti Mandrakesoft a stáhnout\n"
+"seznam zrcadel. Zkontrolujte prosím, zda-li je připojení k síti v pořádku.\n"
+"\n"
+"Mohu pokračovat?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1947,19 +1980,40 @@ msgstr ""
 "\n"
 "Mohu pokračovat?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Prosím počkejte, stahuji adresy zrcadel ze stránek společnosti Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 "Prosím počkejte, stahuji adresy zrcadel ze stránek společnosti Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Chyba při stahování"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Při stahování seznamu zrcadel došlo k chybě:\n"
+"\n"
+"%s\n"
+"Je možné, že síť nebo stránky společnosti Mandrakesoft nejsou k dispozici.\n"
+"Zkuste to prosím později."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1974,12 +2028,17 @@ msgstr ""
 "Je možné, že síť nebo stránky společnosti Mandrakesoft nejsou k dispozici.\n"
 "Zkuste to prosím později."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Není zrcadlo"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1994,63 +2053,63 @@ msgstr ""
 "kdy architektura vašeho procesoru není podporovaná službou\n"
 "oficiálních aktualizací distribuce Mandrakelinux."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Vyberte prosím vhodné zrcadlo."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopíruje se soubor pro zdroj '%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Zkoumá se soubor zdroje '%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Zkoumá se vzdálený soubor zdroje '%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " hotovo."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " selhalo!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s ze zdroje %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Začíná se stahovat '%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Stahování '%s', zbývající čas: %s, rychlost: %s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Stahování '%s', rychlost: %s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Chyba při získávání balíčků"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2067,17 +2126,17 @@ msgstr ""
 "instalační zdroj dostupný a měli byste to zkusit\n"
 "později."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Vyberte zdroje, které si přejete aktualizovat:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2090,7 +2149,7 @@ msgstr ""
 "Chyby:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2101,17 +2160,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Nelze vytvořit zdroj."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Selhání při pokusu o přidání zdroje"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2122,7 +2181,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"Váš zdroj \"%s\", který se používá pro aktualizace, neodpovídá verzi "
+"Mandrakelinuxu, která právě běží (%s).\n"
+"Tento zdroj bude vypnut."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2391,10 +2461,6 @@ msgstr "Nerozpoznané kódování přenosu\n"
 msgid "Unknown error code %d\n"
 msgstr "Neznámá chyba, kód %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Instalovat software"
diff --git a/po/cy.po b/po/cy.po
index dd2b0b05..31cf99a3 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-04-26 22:20-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -58,7 +58,7 @@ msgstr "Dyfais symudol"
 msgid "Path or mount point:"
 msgstr "Llwybr neu bwynt gosod:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Diweddariadau diogelwch"
@@ -125,9 +125,9 @@ msgstr "Math o gyfrwng:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
@@ -136,10 +136,10 @@ msgstr "Dileu"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
@@ -322,8 +322,8 @@ msgstr "Terfyn cyfrwng"
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(dim)"
@@ -412,7 +412,7 @@ msgstr "Diweddaru'r cyfrwng"
 msgid "Regenerate hdlist"
 msgstr "Atgynhyrchu rhestr"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
@@ -515,12 +515,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Rhedeg ym modd defnyddiwr"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -531,568 +531,568 @@ msgstr ""
 "Ni fydd modd i chi greu newidiadau i'r system.\n"
 "ond bydd modd i chi bori'r gronfa ddata presennol."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Hygyrchedd"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Archifo"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Wrth Gefn"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Llosgi CD"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Cywasgiad"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Arall"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Llyfrau"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Llyfrau cyfrifiadurol"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Cwestiynau poblogaidd"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Llenyddiaeth"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Cyfathrebu"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Cronfeydd Data"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Datblygiad"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME a GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE a Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Cnewyllyn"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Golygyddion"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Cyfathrebu"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Efelychwyr"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Offer ffeilio"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Gemau"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Antur"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arcêd"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Byrddau"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Cardiau"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Posau"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Chwaraeon"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategaeth"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Bwrdd gwaith graffigol"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM seiliedig"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Graffigau"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Monitro"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Amlgyfrwng"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Rhwydweithio"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Sgwrs"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Trosglwyddo ffeiliau"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Negesu Chwim"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "E-bost"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Newyddion"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Mynediad pell"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Swyddfa"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Cyhoeddi"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Gwyddorau"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astroleg"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Bywydeg"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Cemeg"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Gwyddor Cyfrifiadureg"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Gwyddorau Daear"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Mathemateg"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Ffiseg"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Cregyn"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Sain"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "System"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Sail"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Ffurfweddu"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Cychwyn ac Ymgychwyn"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Caledwedd"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Pecynnu"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Argraffu"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Datblygiad"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Datblygiad"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Ffontiau"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Consol"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Math 1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "Didfap X11"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Rhyngwladoli"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Cnewyllyn a chaledwedd."
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Llyfrgelloedd"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Gweinyddion"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terfynellau"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Offer testun"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Teganau"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Fideo"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Arhoswch, chwilio..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Atal"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Ychwanegadwy"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Dewiswyd"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Heb ei ddewis"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Rhagor o wybodaeth ar becyn..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Dewiswch"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Dim diweddariad"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1103,28 +1103,28 @@ msgstr ""
 "nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
 "neu rydych wedi eu gosod i gyd yn barod."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Popeth"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Rhagor o wybodaeth"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Gwybodaeth am becynnau"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1135,12 +1135,12 @@ msgstr ""
 "hefyd: \n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1149,7 +1149,7 @@ msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1159,12 +1159,12 @@ msgstr ""
 "Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
 "eu dad-ddewis nawr:\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1175,17 +1175,17 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1196,132 +1196,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Maint dewiswyd: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Ffeiliau:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Cofnod Newid:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Cyfrwng:"
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Enw: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Fersiwn: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Maint: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Crynodeb: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Rheswm am y diweddariad:"
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Diweddariad cywiro gwallau"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Dewisiadau Mandrakelinux"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Pob pecyn, yn ôl grwp"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Pob pecyn, yn ôl maint"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Pob pecyn, yn ôl dyddiad dewis"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Pob pecyn, yn ôl yn ôl ffynhonnell eu storfa"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Pob pecyn, yn ôl diweddariad"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Gadael, yn ôl dyddiad gosod"
@@ -1351,7 +1356,7 @@ msgstr "Ailosod y dewis"
 msgid "Reload the packages list"
 msgstr "Ail lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Diweddaru'r cyfrwng"
@@ -1485,7 +1490,7 @@ msgstr ""
 "Cyfrwng Meddalwedd i alluogi o leiaf un (gwirio yn y colofn Galluogi)\n"
 "\n"
 "\n"
-"Yna ailgychwyn Diweddaru Mandrakelinux."
+"Yna ailgychwyn %s."
 
 #: ../rpmdrake:1140
 #, c-format
@@ -1760,6 +1765,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1773,158 +1783,181 @@ msgstr ""
 "meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
 "i ddewis pa feddalwedd rydych am ei osod ar eich cyfrifiadur."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Tynnu Pecynnau Meddalwedd"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Diweddaru Mandrakelinux"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Na"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Iawn"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Gwybodaeth..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Awstria"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Awstralia"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Groeg"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Sbaen"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Ffindir"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Ffrainc"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Yr Eidal"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Siapan"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norwy"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rwsia"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Tsiena"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Mae angen i mi gysylltu â safle gwe Mandrakesoft i gael y rhestr\n"
+"drychau. Gwiriwch fod eich rhwydwaith yn rhedeg.\n"
+"\n"
+"Ydi hi'n iawn parhau?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1937,18 +1970,38 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau o safle gwe Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau o safle gwe Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Cafwyd gwall wrth lwytho'r rhestr drych i lawr:\n"
+"\n"
+"%s\n"
+"Nid yw'r rhwydwaith, neu safle Mandrakesoft, ar gael.\n"
+"Ceisiwch eto."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1963,12 +2016,17 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu safle Mandrakesoft, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Dim drych"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1983,63 +2041,63 @@ msgstr ""
 "yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
 "Swyddogol Mandrakelinux."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Archwilio ffeil cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Archwilio ffeil bell y cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " gorffen.."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " methwyd!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s o gyfrwng %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Cychwyn llwytho %s i lawr..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Gwall estyn pecynnau"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2056,17 +2114,17 @@ msgstr ""
 "neu nid oes modd ei gyrraedd ar hyn o bryd a dylech geisio eto \n"
 "rhywbryd."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Dewiswch y cyfrwng i'w diweddaru:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2079,7 +2137,7 @@ msgstr ""
 "Gwallau:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2090,17 +2148,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Methu ychwanegu cyfrwng"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2111,7 +2169,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2377,10 +2443,6 @@ msgstr "Amgodio trosglwyddo anhysbys\n"
 msgid "Unknown error code %d\n"
 msgstr "Gwall cod anhysbys %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Diweddaru Mandrakelinux"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Gosod Meddalwedd"
diff --git a/po/da.po b/po/da.po
index 4e2195db..93bdf786 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-08-15 22:02+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -63,7 +63,7 @@ msgstr "Udskiftelig enhed"
 msgid "Path or mount point:"
 msgstr "sti eller monteringspunkt:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Sikkerhedsopdateringer"
@@ -130,9 +130,9 @@ msgstr "Medietype:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Annullér"
@@ -141,10 +141,10 @@ msgstr "Annullér"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "O.k."
@@ -326,8 +326,8 @@ msgstr "Medie-begrænsking"
 msgid "Command"
 msgstr "Kommando"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(ingen)"
@@ -416,7 +416,7 @@ msgstr "Opdatér medie"
 msgid "Regenerate hdlist"
 msgstr "Genskab hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Vent venligst, opdaterer medie..."
@@ -519,12 +519,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Tilføjelse af medie '%s' gennemført."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Kører i brugertilstand"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -535,568 +535,568 @@ msgstr ""
 "Du vil ikke kunne udføre ændringer på systemet,\n"
 "men du vil alligevel kunne kigge på den eksisterende database."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Tilgængelighed"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Arkivering"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Sikkerhedskopi"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Cd-brænding"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Komprimering"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Andet"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Bøger"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Edb-bøger"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "OSS"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Opskrifter"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Litteratur"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Klynge"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "Beskedsoverføring"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "Køtjenester"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Kommunikation"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Databaser"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Udvikling"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME og GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE og Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kerne"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Redigering"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Uddannelse"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulatorer"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Filværktøjer"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Spil"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Æventyr"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Bræt"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kort"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Gåder"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategi"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Grafisk skrivebord"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM baseret"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafik"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Overvåger"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedie"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Netværk"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Filoverførsel"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Øjeblikkelig besked"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Post"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Nyheder"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Fjernadgang"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Kontor"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Offentlige nøgler"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Publicering"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Naturvidenskab"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomi"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologi"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Kemi"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Datalogi"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geologi"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematik"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fysik"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Skaller"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Lyd"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "System"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurering"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Opstart og initialisering"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Udstyr"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Pakning"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Udskrift"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "Udnyttelse"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Udnyttelse"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konsol"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Internationalisering"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kerne og udstyr"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Biblioteker"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Servere"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminaler"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Tekstværktøjer"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Legetøj"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Ingen tilgængelig)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Søgeresultater"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Søgeresultater (ingen)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Vent venligst, søger..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Stop"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Kan opdateres"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Kan tilføjes"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Valgt"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Ikke valgt"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Mere information om pakken..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Vælg"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "En af følgende pakker behøves:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Vent venligst, lister pakker..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Ingen opdatering"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1107,28 +1107,28 @@ msgstr ""
 "findes nogen tilgængelige opdateringer for programmerne installeret\n"
 "på maskinen eller at du allerede har installeret dem alle."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Alt"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Mere info"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Information om pakker"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Nogle yderligere pakker skal fjernes"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1138,12 +1138,12 @@ msgstr ""
 "På grund af deres afhængigheder vil disse pakker også blive fjernet:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Visse pakker kan ikke fjernes"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1152,7 +1152,7 @@ msgstr ""
 "Desværre, fjernelse af disse pakker ville ødelægge systemet:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1163,12 +1163,12 @@ msgstr ""
 "afmarkeres nu:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Yderligere pakker behøves"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1178,17 +1178,17 @@ msgstr ""
 "For at opfylde afhængigheder skal følgende pakker også installeres:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (tilhører overspringningslisten)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Visse pakker kan ikke installeres"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1199,132 +1199,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Visse pakker skal fjernes"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valgt: %d MB / Fri diskplads: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Valgt størrelse: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Beskrivelse ikke tilgængelig for denne pakke\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Filer:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Ændringslog:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Medie: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Nuværende installeret version: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Version: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Størrelse: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Vigtighed: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Resumé: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Årsag til opdatering: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Fejlretningsopdateringer"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Normale opdateringer"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux-valg"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Alle pakker, alfabetisk"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Alle pakker, efter gruppe"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Alle pakker, efter størrelse"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Alle pakker, efter valgstatus"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Alle pakker, efter medielagringsplads"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Alle pakker, efter opdateringstilgængelighed"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Kun blade, sorteret efter installeringsdato"
@@ -1354,7 +1359,7 @@ msgstr "Nulstil det valgte"
 msgid "Reload the packages list"
 msgstr "Genindlæs pakkelisten"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Opdatér medier"
@@ -1769,6 +1774,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1783,158 +1793,181 @@ msgstr ""
 "programmer\n"
 "du vil installere på maskinen."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Opdatering af programpakker"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Opdatér"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Nej"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Østrig"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australien"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Tjekkiet"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grækenland"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Frankrig"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Italien"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norge"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Polen"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rusland"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "U.S.A."
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Må kontakte Mandrakesofts websted for at hente spejllisten.\n"
+"Kontrollér venligst at dit netværk er startet.\n"
+"\n"
+"Er det O.k. at fortsætte?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1947,18 +1980,38 @@ msgstr ""
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Vent venligst, henter spejladresser fra Mandrakesofts websted."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Vent venligst, henter spejladresser fra Mandrakesofts websted."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Fejl under hentning"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Der opstod en fejl ved hentning af spejllisten:\n"
+"\n"
+"%s\n"
+"Netværket eller Mandrakesofts websted kan være utilgængelige.\n"
+"Forsøg igen senere."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1973,12 +2026,17 @@ msgstr ""
 "Netværket eller Mandrakesofts websted kan være utilgængelige.\n"
 "Forsøg igen senere."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Intet spejl"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1993,63 +2051,63 @@ msgstr ""
 "når arkitekturen på din processor ikke understøttes af\n"
 "Mandrakelinux' officielle opdateringer."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Vælg ønsket spejl."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopierer fil for medie `%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Undersøger fil fra medie '%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Undersøger ekstern fil for medie '%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " færdig."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " mislykkedes!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s fra medie %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Starter hentning af `%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Hentning af `%s', resterende tid:%s, hastighed:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Hentning af `%s', hastighed:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Fejl ved hentning af pakker"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2065,17 +2123,17 @@ 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:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Venligst vælg det medie du ønsker at opdatere:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Opdatér"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2088,7 +2146,7 @@ msgstr ""
 "Fejl:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2099,17 +2157,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Kan ikke lave medie."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Fejl ved tilføjelse af medie"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2120,7 +2178,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"Dit medie '%s' til opdateringer passer ikke med den version på Mandrakelinux "
+"som du kører (%s).\n"
+"Den vil blive deaktiveret."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2389,10 +2458,6 @@ msgstr "Ukendt overførselskodning\n"
 msgid "Unknown error code %d\n"
 msgstr "Ukendt fejlkode %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Opdatér"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Installér programmel"
diff --git a/po/de.po b/po/de.po
index 883f0e54..363abe9c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-de\n"
-"POT-Creation-Date: 2004-10-06 14:00+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-10-05 21:50+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <de@li.org>\n"
@@ -64,7 +64,7 @@ msgstr "Wechselmedium"
 msgid "Path or mount point:"
 msgstr "Pfad oder Einhängepunkt:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Sicherheitsupdates"
@@ -131,9 +131,9 @@ msgstr "Typ des Mediums:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:438
-#: ../rpmdrake.pm:575
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -142,10 +142,10 @@ msgstr "Abbrechen"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:438
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -331,8 +331,8 @@ msgstr "Medienbeschränkung"
 msgid "Command"
 msgstr "Befehl"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(keine)"
@@ -424,7 +424,7 @@ msgstr "Medium aktualisieren"
 msgid "Regenerate hdlist"
 msgstr "Erzeuge hdlist neu"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:512
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Aktualisiere Medium, bitte warten ..."
@@ -526,12 +526,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Medium '%s' erfolgreich hinzugefügt."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Arbeite im Benutzer-Modus"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -542,567 +542,568 @@ msgstr ""
 "Sie können zwar keine Änderungen am System vornehmen,\n"
 "sich jedoch den Stand der Datenbank anschauen."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Eingabehilfen"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Archivierung"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Sicherung"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "CD brennen"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Kompression"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Sonstige"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Bücher"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Computerbücher"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "FAQs"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "HOWTOs"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Literatur"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, fuzzy, c-format
 msgid "Message Passing"
 msgstr "Nachricht passiert"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, fuzzy, c-format
 msgid "Queueing Services"
 msgstr "Dienste für Warteschlangen"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Kommunikationen"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Datenbanken"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Entwicklung"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME und GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE und Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Editoren"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Bildung"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulatoren"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Dateiwerkzeuge"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Spiele"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Abenteuer"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Brettspiele"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Karten"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Puzzles"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategie"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Grafische Oberfläche"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM-basiert"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "ICEWM"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafik"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Überwachung"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Netzwerk"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Chatten"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Dateitransfer"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Instant Messaging"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "E-Mail"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Entferner Zugriff"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Büro"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Öffentliche Schlüssel"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Veröffentlichen"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Wissenschaften"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomie"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologie"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Chemie"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Computerwissenschaften"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geowissenschaften"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Mathematik"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Physik"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Klang"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "System"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Basis"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Startvorgang und Initialisierung"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Packen"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Drucken"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
+#, c-format
 msgid "Deploiement"
 msgstr "Entwicklung"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Entwicklung"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Schriftarten"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konsole"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True Type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Typ 1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Internationalisierung"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel und Hardware"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Bibliotheken"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Server"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminals"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Textwerkzeuge"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Spielzeug"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Nicht vorhanden)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Suchergebnisse"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Suchergebnisse (keine)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Bitte warten, ich suche ..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "RpmDrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Aktualisierbar"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Verfügbar"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Markiert"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Nicht markiert"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "RpmDrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Mehr Paketinformationen ..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Bitte wählen Sie"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Sie benötigen eines der folgenden Pakete:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Auflisten der Pakete, bitte warten ..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Keine Update"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1113,28 +1114,28 @@ msgstr ""
 "(noch) keine Aktualisierungen für Ihr System gibt oder dass Sie\n"
 "bereits alle Aktualisierungen auf Ihren Rechner aufgespielt haben."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Alle"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Mehr Infos"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Paketinformationen"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Einige weitere Pakete müssen ebenfalls entfernt werden"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1145,12 +1146,12 @@ msgstr ""
 "werden folgende Pakete gelöscht:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Einige Pakete können nicht entfernt werden"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1159,7 +1160,7 @@ msgstr ""
 "Das Entfernen dieser Pakete würde Ihr System unbrauchbar machen:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1169,12 +1170,12 @@ msgstr ""
 "Um die Abhängigkeiten zu berücksichtigen, muss die Auswahl folgender\n"
 "Pakete zurückgesetzt werden:\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Es werden zusätzliche Pakete benötigt"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1185,17 +1186,17 @@ msgstr ""
 "Pakete ebenfalls installiert werden:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, fuzzy, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (gehört zur Übersprungenenliste)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Einige Pakete konnten nicht installiert werden"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1206,132 +1207,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Einige Pakete müssen entfernt werden"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Ausgewählt: %d MB / Freier Plattenplatz: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Gewählte Größe: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Keine Beschreibung für dieses Paket verfügbar\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Dateien:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "ChangeLog:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Medium: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Momentan installierte Version:"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Name: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Version:"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Größe: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Wichtigkeit: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Zusammenfassung: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Aktualisierungsgründe:"
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Fehlerkorrekturen"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Normale Updates"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux Auswahl"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Alle Pakete, alphabetisch sortiert"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Alle Pakete, nach Gruppe"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Alle Pakete, nach Größe"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Alle Pakete, nach Auswahlstadium"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Alle Pakete, nach Medien"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Alle Pakete nach Verfügbarkeit"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Verbleibende, sortiert nach Installationsdatum"
@@ -1361,7 +1367,7 @@ msgstr "Auswahl zurücksetzen"
 msgid "Reload the packages list"
 msgstr "Paketliste neu laden"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:555
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Medien aktualisieren"
@@ -1496,10 +1502,11 @@ msgid ""
 "\n"
 "Then, restart %s."
 msgstr ""
-"Sie haben schon mindestens ein Update-Medium angegeben, aber imMoment sind "
-"alle diese Medien ausgeschaltet. Sie sollten den SoftwareMedien Manager "
-"ausführen und mindestens eines der Medien aktivieren(Schalten Sie es in der "
-"'Aktiviert' Spalte ein)"
+"Sie haben schon mindestens ein Update-Medium angegeben, aber im Moment sind "
+"alle diese Medien ausgeschaltet. Sie sollten den Software Medien Manager "
+"ausführen und mindestens eines der Medien aktivieren (Schalten Sie es in der "
+"‘Aktiviert’ Spalte ein)\n"
+"Starten Sie anschließend erneut %s."
 
 #: ../rpmdrake:1140
 #, c-format
@@ -1777,6 +1784,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1790,158 +1802,181 @@ msgstr ""
 "Softwarepaketen auf CD-ROM oder DVD. Dieses Programm möchte\n"
 "Ihnen bei der Auswahl der für Sie interessanten Pakete helfen."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Aktualisierung für Softwarepakete"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Nein"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Info ..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Österreich"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australien"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Tschechische Republik"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Deutschland"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Dänemark"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Griechenland"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finnland"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Frankreich"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Italien"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Niederlande"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norwegen"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Polen"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Russland"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Schweden"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Großbritannien"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "China"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:380
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Vereinigte Staaten"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Die Liste der Paketserver muss von der Mandrakesoft Web-Seite\n"
+"geladen werden. Stellen Sie sicher, dass Ihre Netzwerkverbindung besteht.\n"
+"\n"
+"Fortfahren?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1954,18 +1989,37 @@ msgstr ""
 "\n"
 "Fortfahren?"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Bitte warten: Besorgen der Serverliste vom Mandrakesoft-Server ..."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Bitte warten: Besorgen der Serverliste vom Mandrakesoft-Server ..."
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Fehler während des Besorgens"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Es trat ein Fehler beim Besorgen der Serverliste auf:\n"
+"\n"
+"%s\n"
+"Bitte versuchen Sie es später erneut."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1979,12 +2033,17 @@ msgstr ""
 "%s\n"
 "Bitte versuchen Sie es später erneut."
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Kein Mirror"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1999,63 +2058,63 @@ msgstr ""
 "ist, dass es für Ihre Prozessorarchitektur keine regulären Mandrakelinux\n"
 "Aktualisierungen gibt."
 
-#: ../rpmdrake.pm:427
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Bitte wählen Sie Ihren bevorzugten Mirror."
 
-#: ../rpmdrake.pm:473
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Datei für Medium „%s“ kopieren ..."
 
-#: ../rpmdrake.pm:476
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Untersuche Datei des Mediums „%s“ ..."
 
-#: ../rpmdrake.pm:479
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Untersuche Datei auf Medium „%s“ ..."
 
-#: ../rpmdrake.pm:483
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " fertig."
 
-#: ../rpmdrake.pm:487
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " gescheitert!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:491
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s von Medium %s"
 
-#: ../rpmdrake.pm:495
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Starte das Besorgen von „%s“ ..."
 
-#: ../rpmdrake.pm:499
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Besorgen von „%s“, Dauer: %s, Geschwindigkeit: %s"
 
-#: ../rpmdrake.pm:502
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Besorgen von „%s“, Geschwindigkeit: %s"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Fehler beim Abrufen von Paketen"
 
-#: ../rpmdrake.pm:525
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2073,17 +2132,17 @@ msgstr ""
 "nicht\n"
 "erreichbar und Sie sollten es später nochmals versuchen."
 
-#: ../rpmdrake.pm:563
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Bitte wählen Sie die zu aktualisierenden Medien:"
 
-#: ../rpmdrake.pm:579
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../rpmdrake.pm:601
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2096,7 +2155,7 @@ msgstr ""
 "Fehler:\n"
 "%s"
 
-#: ../rpmdrake.pm:620 ../rpmdrake.pm:625
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2106,17 +2165,17 @@ msgstr ""
 "Konnte das Medium nicht hinzufügen, Fehlerbericht:\n"
 "%s"
 
-#: ../rpmdrake.pm:636
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Ich kann das Medium nicht anlegen."
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Fehler beim Hinzufügen des Mediums"
 
-#: ../rpmdrake.pm:642
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2127,7 +2186,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:654
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"Ihr Aktualisierungsmedium „%s“ stimmt nicht mit der aktuell laufenden "
+"Mandrakelinux Version überein (%s).\n"
+"Es wird deaktiviert."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2397,10 +2467,6 @@ msgstr "Unbekannte Transfer-Kodierung\n"
 msgid "Unknown error code %d\n"
 msgstr "Unbekannte Fehler-Nr. %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Software installieren"
diff --git a/po/el.po b/po/el.po
index 348531d8..76bb02cc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-el\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2003-09-06 02:07+0300\n"
 "Last-Translator:  Νίκος Νύκταρης (Nick Niktaris)  <niktarin@yahoo.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -61,7 +61,7 @@ msgstr "Αφαιρούμενη συσκευή"
 msgid "Path or mount point:"
 msgstr "Θέση ή σημείο προσάρτησης: "
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Αναβαθμίσεις Ασφαλείας"
@@ -128,9 +128,9 @@ msgstr "Τύπος μέσου:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Ακύρωση"
@@ -139,10 +139,10 @@ msgstr "Ακύρωση"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -324,8 +324,8 @@ msgstr "Όριο μέσων"
 msgid "Command"
 msgstr "Καναδάς"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(κανένα)"
@@ -414,7 +414,7 @@ msgstr "Ανανέωση μέσου"
 msgid "Regenerate hdlist"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Παρακαλώ περιμένετε, ανανεώνεται το μέσο..."
@@ -511,12 +511,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Εκτέλεση σε λειτουργία χρήστη"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -527,568 +527,568 @@ msgstr ""
 " Δεν θα μπορείτε να εκτελέσετε τροποποιήσεις στο σύστημα σας,\n"
 "αλλά θα μπορείτε να περιηγηθείτε στην υπάρχουσα βάση δεδομένων."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Προσιτότητα"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Αρχειοθέτηση"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Αντίγραφα Ασφαλείας"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Εγγραφή Cd"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Συμπίεση"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Άλλα"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Βιβλία"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Βιβλία υπολογιστών"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Συνχές Ερωτήσεις"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Λογοτεχνία"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Επικοινωνίες"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Βάσεις Δεδομένων"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Ανάπτυξη"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME και GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE και Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Πυρήνας"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Διορθωτές"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Επικοινωνίες"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Εξομοιωτές"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Εργαλεία αρχείων"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Παιχνίδια"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Περιπέτεια"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Ηλεκτρονικά"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Επιτραπέζια"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Χαρτιά"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Παζλ"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Αθλητικά"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Στρατηγική"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Γραφικές Επιφάνειες Εργασίας"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "Τύπου FVWM"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Γραφικά"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Παρακολούθηση"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Πολυμέσα"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Δίκτυο"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, fuzzy, c-format
 msgid "Chat"
 msgstr "Κίνα"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Μεταφορά Αρχείου"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Στιγμιαία μηνύματα"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Ταχυδρομείο"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Ειδήσεις"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Απομακρυσμένη πρόσβαση"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "Ιστοσελίδες"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Γραφείο"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Εκδόσεις"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Επιστήμες"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Αστρονομία"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Βιολογία"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Χημεία"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Επιστήμη υπολογιστών"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Φυσικές Επιστήμες"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Μαθηματικά"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Φυσική"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Φλοιοί"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Ήχος"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Σύστημα"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Βάση"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Ρυθμίσεις"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Εκκίνηση και Init"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Υλικό"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Πακέτα"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Εκτύπωση"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Ανάπτυξη"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Ανάπτυξη"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Γραμματοσειρές"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Κονσόλα"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Διεθνοποίηση"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Πυρήνας και υλικό"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Βιβλιοθήκες"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Διακομιστές"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Τερματικά"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Εργαλεία κειμένου"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Παιχνιδάκια"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Βίντεο"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Δεν είναι διαθέσιμο/η)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Αποτέλεσμα Αναζήτησης"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Αποτέλεσμα Αναζήτησης (κανένα)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Παρακαλώ περιμένετε, γίνεται αναζήτηση..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Τερματισμός"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Αναβαθμίσιμα"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Προστιθέμενα"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Επιλεγμένα"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Μη επιλεγμένα"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, fuzzy, c-format
 msgid "Rpmdrake %s"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Περισσότερες πληροφορίες για το πακέτο..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Παρακαλώ επιλέξτε"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ένα από τα παρακάτω πακέτα απαιτούνται:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Παρακαλώ περιμένετε, ταξινομούνται τα πακέτα"
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Χωρίς αναβαθμίσεις"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1099,28 +1099,28 @@ msgstr ""
 "υπάρχουν διαθέσιμα πακέτα για αναβάθμιση για τα εγκατεστημένα\n"
 "πακέτα του υπολογιστή σας ή τα έχετε ήδη αναβαθμίσει."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Όλα"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Περισσότερες πληροφορίες"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Πληροφορίες για τα πακέτα"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Ορισμένα επιπλέον πακέτα πρέπει να αφαιρεθούν"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1131,12 +1131,12 @@ msgstr ""
 "να αφαιρεθούν:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Ορισμένα πακέτα δεν μπορούν να αφαιρεθούν"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1145,7 +1145,7 @@ msgstr ""
 "Συγνώμη, αλλά η αφαίρεση αυτών των πακέτων θα καταστρέψει το σύστημά σας:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1156,12 +1156,12 @@ msgstr ""
 "να αποεπιλεγούν:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Απαιτούνται επιπλέον πακέτα"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1172,17 +1172,17 @@ msgstr ""
 " τα παρακάτω πακέτα:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Ορισμένα πακέτα δεν μπορούν να εγκατασταθούν"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1193,132 +1193,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Ορισμένα πακέτα πρέπει να αφαιρεθούν"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Επιλεγμένο: %d MB/ Ελεύθερος χώρος στον δίσκο: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Επιλεγμένο μέγεθος: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Άρχεία:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Αλλαγές:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Μέσο: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Τρέχουσα εγκατεστημένη έκδοση: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Έκδοση: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Μέγεθος: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Σπουδαιότητα: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Σύνοψη: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Αιτία αναβάθμισης: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Περιγραφή: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Αναβαθμίσεις διορθώσεων"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Κανονικές αναβαθμίσεις"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Επιλογές Mandrakelinux"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Όλα τα πακέτα, αλφαβητικά"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Όλα τα πακέτα, βάση ομάδας"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Όλα τα πακέτα, βάση μεγέθους"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Όλα τα πακέτα, βάση κατάστασης επιλογής"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr ""
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Όλα τα πακέτα, βάση διαθεσιμότητας αναβάθμισης"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
@@ -1348,7 +1353,7 @@ msgstr "Επαναφορά της επιλογής"
 msgid "Reload the packages list"
 msgstr "Ανανέωση της λίστας πακέτων"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Ανανέωση μέσων"
@@ -1759,6 +1764,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1772,158 +1782,182 @@ msgstr ""
 "Αυτό το εργαλείο θα σας βοηθήσει να επιλέξετε το πρόγραμμα που θέλετε\n"
 "να εγκαταστήσετε στον υπολογιστή σας."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Αφαίρεση Πακέτων Λογισμικού"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Όχι"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Ναι"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Πληροφορίες..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Αυστρία"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Αυστραλία"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Βέλγιο"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Βραζιλία"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Καναδάς"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Κόστα Ρίκα"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Τσεχία"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Γερμανία"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Δανία"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Ελλάδα"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Ισπανία"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Φινλανδία"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Γαλλία"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Ισραήλ"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Ιταλία"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Ιαπωνία"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Κορέα"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Ολλανδία"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Νορβηγία"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Πολωνία"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Πορτογαλία"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Ρωσία"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Σουηδία"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Ταϊβάν"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Ηνωμένο Βασίλειο"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Κίνα"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Ηνωμένες Πολιτείες Αμερικής"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Πρέπει να επικοινωνήσω με την ιστοσελίδα της Mandrakesoft  για να πάρω\n"
+"την λίστα με τις εναλλακτικές διευθύνσεις\n"
+"Παρακαλώ ελέγξτε ότι το δίκτυό σας είναι ενεργό\n"
+"\n"
+"Να συνεχιστεί;"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1937,7 +1971,14 @@ msgstr ""
 "\n"
 "Να συνεχιστεί;"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Παρακαλώ περιμένετε γίνεται η λήψη των διευθύνσεων των εναλλακτικών θέσεων "
+"από την Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
@@ -1945,12 +1986,27 @@ msgstr ""
 "Παρακαλώ περιμένετε γίνεται η λήψη των διευθύνσεων των εναλλακτικών θέσεων "
 "από την Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Σφάλμα κατά τη λήψη"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Σφάλμα κατά τη λήψη της λίστας των εναλλακτικών διευθύνσεων:\n"
+"\n"
+"%s\n"
+"Το δίκτυο ή η ιστοσελίδα της Mandrakesoft μπορεί να μην είναι διαθέσιμη.\n"
+"Παρακαλώ προσπαθήστε ξανά αργότερα."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1965,12 +2021,17 @@ msgstr ""
 "Το δίκτυο ή η ιστοσελίδα της Mandrakesoft μπορεί να μην είναι διαθέσιμη.\n"
 "Παρακαλώ προσπαθήστε ξανά αργότερα."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Χωρίς εναλλακτικές"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1986,63 +2047,63 @@ msgstr ""
 "η αρχιτεκτονική του επεξεργαστή σας από τις επίσημες αναβαθμίσεις από το \n"
 "Mandrakelinux"
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Παρακαλώ επιλέξτε την επιθυμητή εναλλακτική."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Αντιγραφή αρχείου από το μέσο `%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Εξέταση αρχείο από το μέσο `%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Εξέταση απομακρισμένου αρχείου του μέσου `%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " τέλος."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " απέτυχε!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s για το μέσο %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Εκκίνηση λήψης του `%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Λήψη του `%s', χρόνος που απομένει:%s, ταχύτητα:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Λήψη του `%s', ταχύτητα:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2053,17 +2114,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Επιλέξτε τα μέσα που θέλετε να ανανεώσετε:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Ανανέωση"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2075,7 +2136,7 @@ msgstr ""
 "Σφάλματα:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2083,17 +2144,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Αδυναμία δημιουργίας μέσου."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "Παρακαλώ περιμένετε, προστίθεται το μέσο..."
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2104,7 +2165,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2372,10 +2441,6 @@ msgstr "Άγνωστη κωδικοποίηση μεταφοράς\n"
 msgid "Unknown error code %d\n"
 msgstr "Άγνωστος κωδικός σφάλματος %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Εγκατάσταση Λογισμικού"
diff --git a/po/eo.po b/po/eo.po
index eefc4664..ee3c99ca 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-eo\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2003-08-21 11:57+0000\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Retirebla datenportilo"
 msgid "Path or mount point:"
 msgstr "Pado aŭ surmetingo:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Sekurecaj ĝisdatigoj"
@@ -127,9 +127,9 @@ msgstr "Speco de datenportilo:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Forigu"
@@ -138,10 +138,10 @@ msgstr "Forigu"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Jes"
@@ -323,8 +323,8 @@ msgstr "Portil-limo"
 msgid "Command"
 msgstr "Komando"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(nenio)"
@@ -411,7 +411,7 @@ msgstr "Ĝisdatigo de datenportilo"
 msgid "Regenerate hdlist"
 msgstr "Restarigu liston de pakaĵoj"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Bonvole atendu, mi ĝisdatigas..."
@@ -506,12 +506,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Rulanta en uzul-modo"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -522,568 +522,568 @@ msgstr ""
 "Vi ne povos fari modifojn en la sistemo,\n"
 "sed vi povos daŭre trarigardi la ekzistantan datenbazon."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Alirebleco"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Arkivado"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Savkopio"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "KD-skribado"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Kompaktado"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Alia"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Libroj"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Komputilaj libroj"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Respondaro"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Kielfari (Howtos)"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Literaturo"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Komunikaĵoj"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Datenbazoj"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Programado"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME kaj GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE kaj Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kerno"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Redaktiloj"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Komunikaĵoj"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Imitiloj"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Dosieriloj"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Ludoj"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Aventuro"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Kartoj"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kartoj"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Puzloj"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sporto"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategio"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Grafika labortabulo"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "Bazita sur FVMW"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafikoj"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Monitorado"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Sono kaj filmo"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Retumado"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Babilo"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Dosiertransigo"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Instant messaging"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Poŝto"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Novaĵoj"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Defora atingo"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "TTT"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Oficejo"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Publikado"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Sciencoj"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomio"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologio"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Kemio"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Komputilscienco"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geosciencoj"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematiko"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fiziko"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Ŝeloj"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Sono"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sistemo"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Bazo"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurado"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Starto kaj inico"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Aparataro"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Pakante"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Presante"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Programado"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Programado"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Tiparoj"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konsolo"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "TTF-tiparo"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Speco1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11-bitmapo"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Internaciigo"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kerno kaj aparataro"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Libraroj"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Serviloj"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminaloj"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Tekstiloj"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Ludiloj"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Vidbendo"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Neatingebla)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Serĉrezultoj"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Serĉrezultoj (neniu)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Bonvole atendu dum mi serĉas..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Haltu"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Ĝisdatigebla"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Aldonebla"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Elektita(j)"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Ne elektita"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, fuzzy, c-format
 msgid "Rpmdrake %s"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Kromaj informoj pri pakaĵo..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Bonvole elektu"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Necesas unu el la sekvaj pakaĵoj:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Bonvole atendu, mi listigas pakaĵojn..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Neniu ĝisdatigo"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1094,28 +1094,28 @@ msgstr ""
 "akirebla ĝisdatigo por la pakaĵoj instalitaj en via komputilo,\n"
 "aŭ vi jam instalis ilin ĉiujn."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Ĉiuj"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Pli da informo"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Informo pri pakaĵoj"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Kelkaj kromaj pakaĵoj devas esti forigitaj"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1126,12 +1126,12 @@ msgstr ""
 "pakaĵo(j) estu malinstalotaj:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Kelkaj pakaĵoj ne malinstaleblas"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1140,7 +1140,7 @@ msgstr ""
 "Malinstalo de tiuj pakaĵoj kolapsigus vian sistemon, bedaŭrinde:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1151,12 +1151,12 @@ msgstr ""
 "nun malelektataj:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Necesas kromaj pakaĵoj"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1167,17 +1167,17 @@ msgstr ""
 "esti instalitaj:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Kelkaj pakaĵoj ne instaleblas"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1188,132 +1188,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Kelkaj pakaĵoj devas esti malinstalotaj"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Elektita: %d MB / Libera diskospaco: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Elektita grandeco: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Dosieroj:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Portilo: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Nun instalita versio: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Nomo: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Versio: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Grandeco: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Graveco: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Resumo: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Kialo por ĝisdatigi: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Priskribo: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Cimo-riparaj ĝisdatigoj"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Normalaj ĝisdatigoj"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrak-elektoj"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Ĉiuj pakaĵoj, laŭ alfabeto"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Ĉiuj pakaĵoj, laŭgrupe"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Ĉiuj pakaĵoj, laŭ grandeco"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Ĉiuj pakaĵoj, laŭ stato de elekto"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Ĉiuj pakaĵoj, laŭ portil-deponejo"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Ĉiuj pakaĵoj, laŭ ebleco de ĝisdatigo"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Nur forlasas, vicigita de instalo-dato"
@@ -1343,7 +1348,7 @@ msgstr "Reŝargu la elekton"
 msgid "Reload the packages list"
 msgstr "Reŝargu la liston de pakaĵoj"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Ĝisdatigu datenportilon"
@@ -1759,6 +1764,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1772,158 +1782,181 @@ msgstr ""
 "sur KDRomo aŭ DVD. Tiu ĉi ilo helpos vin elekti kiujn programojn\n"
 "vi deziras instali en via komputilo."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Malinstalilo por program-pakaĵoj"
+
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux-Ĝisdatigo (%s)"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Jes"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Informoj..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Aŭstrio"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australio"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgio"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brazilo"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanado"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Kostariko"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "la Ĉeĥa Respubliko"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Germanio"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Danio"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grekio"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Hispanujo"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finnlando"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Francio"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israelo"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Italio"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japanio"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Koreio"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Nederlando"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norvegio"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Pollando"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugalio"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rusio"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Svedio"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Tajvano"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Unuiĝinta Regno"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Ĉinio"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Usono"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Mi devas kontakti la retpaĝon de Mandrakesoft por akiri la spegulliston.\n"
+"Bonvole kontrolu ke vi estas nun rete konektita.\n"
+"\n"
+"Ĉu mi nun daŭrigu?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1936,19 +1969,40 @@ msgstr ""
 "\n"
 "Ĉu mi nun daŭrigu?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Bonvole atendu, mi deŝutas speguladresojn de la retpaĝo de Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 "Bonvole atendu, mi deŝutas speguladresojn de la retpaĝo de Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Eraro dum deŝutado"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Okazis eraro dum deŝutado de la spegullisto:\n"
+"\n"
+"%s\n"
+"La reto, aŭ la retpaĝo de Mandrakesoft, eble ne atingeblas.\n"
+"Bonvolu reprovi poste."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1963,12 +2017,17 @@ msgstr ""
 "La reto, aŭ la retpaĝo de Mandrakesoft, eble ne atingeblas.\n"
 "Bonvolu reprovi poste."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Nenia spegulo"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1983,63 +2042,63 @@ msgstr ""
 "la kazo kiam la arkitekturo de via procezilo ne estas subtenata\n"
 "de Oficialaj Ĝisdatigoj de Mandrak-Linukso."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Bonvole elektu la deziratan spegulon."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopiante dosieron por la datenportilo '%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Kontrolante la dosieron de portilo '%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Kontrolante foran dosieron de portilo '%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " farita."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " malsukcesis!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Startigas deŝuton de '%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Deŝuto de '%s', tempo por fari:%s, rapideco:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Deŝuto de `%s', rapideco:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2050,17 +2109,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Bonvole elektu la datenportilon kiun vi deziras ĝisdatigi:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Ĝisdatigu"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2073,7 +2132,7 @@ msgstr ""
 "Eraroj:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2081,17 +2140,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Ne povis krei datenportilon."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "Bonvole atendu, mi aldonas portilon..."
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2102,7 +2161,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2368,10 +2435,6 @@ msgstr "Nerekonata transig-kodigo\n"
 msgid "Unknown error code %d\n"
 msgstr "Nekonata erarkodo %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux-Ĝisdatigo (%s)"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Instalu programojn"
diff --git a/po/es.po b/po/es.po
index 6d7a58de..3378e92c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-08-05 18:16-0300\n"
 "Last-Translator: Fabian Mandelbaum <fmandelbaum@hotmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -63,7 +63,7 @@ msgstr "Dispositivo removible"
 msgid "Path or mount point:"
 msgstr "Ruta o punto de montaje:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Actualizaciones de seguridad"
@@ -130,9 +130,9 @@ msgstr "Tipo de soporte:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
@@ -141,10 +141,10 @@ msgstr "Cancelar"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
@@ -326,8 +326,8 @@ msgstr "Límite de soportes"
 msgid "Command"
 msgstr "Comando"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(ninguno)"
@@ -417,7 +417,7 @@ msgstr "Actualizar soporte"
 msgid "Regenerate hdlist"
 msgstr "Volver a generar hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Por favor espere, actualizando soportes..."
@@ -520,12 +520,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Soporte `%s' añadido satisfactoriamente."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Ejecutando en modo usuario"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -536,568 +536,568 @@ msgstr ""
 "No podrá realizar modificaciones en el sistema,\n"
 "pero puede navegar por la base de datos de paquetes."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Accesibilidad"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Archivado"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Copia de respaldo"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Grabación de CD"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Compresión"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Otro"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Libros"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Libros de computación"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Faqs"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "COMOs"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "Paso de mensajes"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "Servicios de cola"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Comunicaciones"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Bases de datos"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Desarollo"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME y GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE y QT"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Núcleo"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Editores"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Educación"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emuladores"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Herramientas de archivo"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Juegos"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Aventura"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Tableros"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Naipes"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Rompecabezas"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Deportes"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Estrategia"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Entorno gráfico"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "Basado en FVWM"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Monitoreo"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedios"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Red"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Transferencia de archivos"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Mensajería instantánea"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Correo"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Noticias"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Acceso remoto"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Ofimática"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Claves públicas"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Edición"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Ciencias"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomía"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biología"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Química"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Ciencias de la computación"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geociencias"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matemáticas"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Física"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Sonido"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sistema"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Configuración"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Arranque e Init"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Empaquetado"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Impresión"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "Despliegue"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Despliegue"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Consola"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True Type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "Bitmap X11"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Internacionalización"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Núcleo y hardware"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Bibliotecas"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Servidores"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminales"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Herramientas de texto"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Juguetes"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(No disponible)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Resultados de la búsqueda"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Resultados de la búsqueda (ninguno)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Por favor espere, buscando ..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Detener"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Actualizable"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Agregable"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "No seleccionado"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Más información sobre el paquete..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Por favor, elija"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Se necesita uno de los paquetes siguientes:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Por favor espere, listando paquetes..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Sin actualizaciones"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1108,28 +1108,28 @@ msgstr ""
 "actualizaciones disponibles para los paquetes instalados en su computadora,\n"
 "o bien ya los instaló a todos."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Todo"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Más información"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Información sobre paquetes"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Se necesitan quitar algunos paquetes adicionales"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1140,12 +1140,12 @@ msgstr ""
 "siguientes:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "No se pueden quitar algunos paquetes"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1154,7 +1154,7 @@ msgstr ""
 "Eliminando estos paquetes podria estropear su sistema, lo siento:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1165,12 +1165,12 @@ msgstr ""
 "paquetes siguientes:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Se necesitan paquetes adicionales"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1181,17 +1181,17 @@ msgstr ""
 "paquetes siguientes:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (es parte de la lista de omisión)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Algunos paquetes no se pueden instalar"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1202,132 +1202,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Se necesita quitar algunos paquetes"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seleccionado: %d MB / Disponible en disco: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Tamaño seleccionado: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Descripción no disponible para este paquete\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Archivos:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Cambios:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Soporte: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Versión actualmente instalada: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Versión: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Tamaño: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Importancia: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Resumen: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Razón para actualizar: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Descripción: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Actualizaciones que corrigen bugs"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Actualizaciones normales"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Selecciones de Mandrakelinux"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Todos los paquetes, alfabético"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Todos los paquetes, por grupo"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Todos los paquetes, por tamaño"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Todos los paquetes, por estado de la selección"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Todos los paquetes, por repositorio de soporte"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Todos los paquetes, por disponibilidad de actualización"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Sólo hojas, clasificadas por fecha de instalación"
@@ -1357,7 +1362,7 @@ msgstr "Reiniciar la selección"
 msgid "Reload the packages list"
 msgstr "Recargar la lista de paquetes"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Actualizar soportes"
@@ -1776,6 +1781,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1789,158 +1799,181 @@ msgstr ""
 "CDROM o DVD. Esta herramienta lo ayudará a elegir el software que desea\n"
 "instalar en su computadora."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Actualización de paquetes de software"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Actualización de Mandrakelinux"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "No"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Sí"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Alemania"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Dinamarca"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "España"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Francia"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japón"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Países Bajos"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "China"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Necesito contactar al sitio web de Mandrakesoft para obtener la lista de\n"
+"sitios de réplica. Por favor, verifique que su conexión de red está activa.\n"
+"\n"
+"¿Desea continuar?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1953,7 +1986,14 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Por favor espere, descargando las direcciones de los sitios de réplica desde "
+"el sitio web de Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
@@ -1961,12 +2001,27 @@ msgstr ""
 "Por favor espere, descargando las direcciones de los sitios de réplica desde "
 "el sitio web de Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Error durante la descarga"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Hubo un error descargando la lista de sitios de réplica:\n"
+"\n"
+"%s\n"
+"Tal vez no está disponible la red, o el sitio web de Mandrakesoft.\n"
+"Por favor, intente nuevamente más tarde."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1981,12 +2036,17 @@ msgstr ""
 "Tal vez no está disponible la red, o el sitio web de Mandrakesoft.\n"
 "Por favor, intente nuevamente más tarde."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Sin sitio de réplica"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2001,63 +2061,63 @@ msgstr ""
 "arquitectura de su procesador no está soportada por las Actualizaciones\n"
 "Oficiales de Mandrakelinux."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Por favor, elija el sitio de réplica deseado."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copiando archivo para soporte `%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Examinando archivo de soporte `%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Examinando archivo remoto de soporte `%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr "hecho."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr "¡falló!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s de soporte %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Comenzando descarga de «%s»..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Descarga de `%s', faltan:%s, velocidad:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Descarga de `%s', velocidad:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Error recuperando paquetes"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2074,17 +2134,17 @@ msgstr ""
 "momento no se puede acceder al mismo y debería volver a intentar\n"
 "más tarde."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Seleccione los soportes que desea actualizar:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2097,7 +2157,7 @@ msgstr ""
 "Errores:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2108,17 +2168,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "No se puede crear el soporte."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Fallo al añadir soporte"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2129,7 +2189,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"Su soporte `%s', utilizado para actualizaciones, no coincide con la versión "
+"de Mandrakelinux que está corriendo (%s).\n"
+"Será deshabilitado."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2398,10 +2469,6 @@ msgstr "Codificación de transferencia desconocida\n"
 msgid "Unknown error code %d\n"
 msgstr "Código de error desconocido %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Actualización de Mandrakelinux"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Instalar software"
diff --git a/po/et.po b/po/et.po
index d0aa7613..66ace818 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-08-15 12:58+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -57,7 +57,7 @@ msgstr "Eemaldatav seade"
 msgid "Path or mount point:"
 msgstr "Otsingutee või haakepunkt:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Turvaparandused"
@@ -124,9 +124,9 @@ msgstr "Andmekandja tüüp:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Katkesta"
@@ -135,10 +135,10 @@ msgstr "Katkesta"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
@@ -319,8 +319,8 @@ msgstr "Andmekandjate limiit"
 msgid "Command"
 msgstr "Käsk"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(puudub)"
@@ -409,7 +409,7 @@ msgstr "Allika uuendamine"
 msgid "Regenerate hdlist"
 msgstr "Hdlisti taasloomine"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Palun oodake, uuendan andmekandjat..."
@@ -510,12 +510,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Andmekandja '%s' edukalt lisatud."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Töötamine kasutaja õigustega"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -526,568 +526,568 @@ msgstr ""
 "Te ei saa nii küll süsteemis mingeid muutusi ette võtta,\n"
 "kuid võite siiski sirvida olemasolevat andmebaasi."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Hõlbustus"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Arhiveerimine"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Varundamine"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "CD-de kirjutamine"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Tihendus"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Muu"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Raamatud"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Arvutiraamatud"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "KKK"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "HOWTO"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Kirjandus"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Klaster"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "Teateedastus"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "Järjekorrateenused"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Kommunikatsioon"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Andmebaasid"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Arendus"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME ja GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE ja Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Redaktorid"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Haridus"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulaatorid"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Failivahendid"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Mängud"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Seiklusmängud"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Võitlusmängud"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Lauamängud"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kaardimängud"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Pusled"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strateegia"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Graafiline töölaud"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "IceWM"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Graafika"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Monitooring"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimeedia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Võrk"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Failiedastus"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Kiirsuhtlus"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "E-post"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Uudised"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Kaugligipääs"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Kontoritöö"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Avalikud võtmed"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Publitseerimine"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Teadus"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronoomia"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Bioloogia"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Keemia"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Arvutiteadus"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geograafia"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matemaatika"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Füüsika"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Shellid"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Heli"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Süsteem"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Baas"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Seadistamine"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Algkäivitus"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Riistvara"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Paketindus"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Trükkimine"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "Jaosvõrk"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Jaosvõrk"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Fondid"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konsool"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True Type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Internatsionaliseerimine"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel ja riistvara"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Teegid"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Serverid"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminalid"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Tekstivahendid"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Mänguasjad"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(kättesaamatu)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Otsingu tulemused"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Otsingu tulemus (ei leitud)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Palun oodake, otsin..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Peata"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Uuendatavad"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Lisatavad"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Valitud"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Valimata"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Rohkem infot paketi kohta..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Palun valige"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vajalik on üks järgmistest pakettidest:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Palun oodake, koostan nimekirja..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Uuendusi ei ole"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1098,28 +1098,28 @@ msgstr ""
 "paigaldatud pakettidele ei ole parajasti mingeid uuendusi või\n"
 "Te olete need juba kõik paigaldanud."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Kõik"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Rohkem infot"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Info pakettide kohta"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Et kõik töötaks, on vaja lisaks eemaldada mõned paketid"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1129,12 +1129,12 @@ msgstr ""
 "Kõigi sõltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Mõnda paketti ei saa eemaldada"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1143,7 +1143,7 @@ msgstr ""
 "Vabandust, nende pakettide eemaldamine võib halvata Teie süsteemi:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1153,12 +1153,12 @@ msgstr ""
 "Sõltuvuste tõttu ei saa järgmisi pakette valida:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Vajalikud lisapaketid"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1168,17 +1168,17 @@ msgstr ""
 "Sõltuvuste rahuldamiseks tuleb paigaldada ka järgmised paketid:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (kuulub vahelejäetavate hulka)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Mõnda paketti ei saa paigaldada"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1189,132 +1189,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Mõned paketid tuleb eemaldada"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valitud: %d MB / Vaba kettaruumi %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Valitud pakettide maht: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Sellel paketil pole kirjeldust\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Failid:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Muutuste logi:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Andmekandja: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Praegu paigaldatud versioon: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Nimi: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Versioon: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Suurus: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Tähtsus: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Kokkuvõte: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Uuendamise põhjus: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Kirjeldus: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Turvaparandused/uuendused"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Uuendused"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux valikud"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Kõik paketid tähestikuliselt"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Kõik paketid grupi järgi"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Kõik paketid suuruse järgi"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Kõik paketid valikustaatuse järgi"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Kõik paketid andmekandja järgi"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Kõik paketid uuendamisstaatuse järgi"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Ainult sõltuvusteta paketid paigaldusaja järgi"
@@ -1344,7 +1349,7 @@ msgstr "Lähtesta valik"
 msgid "Reload the packages list"
 msgstr "Laadi pakettide nimekiri uuesti"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Uuenda allikaid"
@@ -1484,7 +1489,7 @@ msgstr ""
 "Teil tuleks käivitada tarkvara allikate haldur,\n"
 "et vähemalt üks lubada (klõpsake selleks veerul 'Kas lubada?').\n"
 "\n"
-"Seejärel käivitage Mandrakelinux uuendused uuesti."
+"Seejärel käivitage %s uuesti."
 
 #: ../rpmdrake:1140
 #, c-format
@@ -1504,7 +1509,7 @@ msgstr ""
 "Selleks käivitage tarkvara allikate haldur\n"
 "ja lisage 'turvauuenduste' allikas.\n"
 "\n"
-"Seejärel taaskäivitage Mandrakelinux uuendused."
+"Seejärel taaskäivitage %s."
 
 #: ../rpmdrake:1170
 #, c-format
@@ -1752,12 +1757,17 @@ msgid ""
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 msgstr ""
-"Mandrakelinux uuendused\n"
+"%s\n"
 "\n"
 "Selle tööriista abil saate oma Mandrakelinuxit uuendada."
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1770,158 +1780,181 @@ msgstr ""
 "Mandrakelinuxi CDROM või DVD sisaldab tuhandeid tarkvarapakette.\n"
 "Selle tööriista abil saate valida, millised soovite oma arvutile paigaldada."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Tarkvara uuendamine"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux uuendused"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Ei"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Jah"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Austraalia"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasiilia"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Tšehhi Vabariik"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Saksamaa"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Taani"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Kreeka"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Hispaania"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Soome"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Prantsusmaa"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Iisrael"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Itaalia"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Jaapan"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norra"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Poola"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Venemaa"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Rootsi"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Suurbritannia"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Hiina"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "USA"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Peeglite nimekirja hankimiseks tuleb ühendust võtta Mandrakesofti\n"
+"veebileheküljega. Kontrollige palun, et Internetiühendus töötab.\n"
+"\n"
+"Kas jätkata?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1934,18 +1967,38 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Palun oodake, laen peeglite aadresse..."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Palun oodake, laen peeglite aadresse..."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Viga allalaadimisel"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Peeglite nimekirja allalaadimisel tekkis viga:\n"
+"\n"
+"%s\n"
+"Võrk või Mandrakesofti veebilehekülg ei pruugi olla kättesaadav.\n"
+"Palun proovige varsti uuesti."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1960,12 +2013,17 @@ msgstr ""
 "Võrk või Mandrakesofti veebilehekülg ei pruugi olla kättesaadav.\n"
 "Palun proovige varsti uuesti."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Peeglit ei leitud"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1979,63 +2037,63 @@ msgstr ""
 "Sellel võib olla mitu põhjust. Kõige tavalisem on see, et Mandrakelinuxi\n"
 "ametlikud uuendused ei toeta Teie protsessori arhitektuuri."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Palun valige peegel."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Faili kopeerimine allika `%s' jaoks..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Allikafaili `%s' uurimine..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Allikafaili `%s' uurimine..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " tehtud."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " ebaõnnestus!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s andmekandjalt %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "'%s' allalaadimise alustamine..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' allalaadimine, aega jäänud:%s, kiirus:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' allalaadimine, kiirus:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Viga pakettide hankimisel"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2052,17 +2110,17 @@ msgstr ""
 "lihtsalt ajutiselt kättesaamatu, millisel juhul võiks hiljem\n"
 "uuesti proovida nimekirja hankida."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Valige allikad, mida soovite uuendada:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Uuenda"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2075,7 +2133,7 @@ msgstr ""
 "Vead:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2086,17 +2144,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Andmekandja loomine ebaõnnestus."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Viga andmekandja lisamisel"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2107,7 +2165,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"Teie uuendusteks kasutatav andmekandja '%s' ei klapi arvutis töötava "
+"Mandrakelinuxi versiooniga (%s).\n"
+"Seepärast seda ei kasutata."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2376,10 +2445,6 @@ msgstr "Tundmatu ülekandekodeering\n"
 msgid "Unknown error code %d\n"
 msgstr "Tundmatu veakood %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux uuendused"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Tarkvara paigaldamine"
diff --git a/po/eu.po b/po/eu.po
index fdf459da..bde483e4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-eu\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-08-16 02:05+0200\n"
 "Last-Translator: Iñigo Salvador Azurmend <xalba@euskalnet.net>\n"
 "Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
@@ -61,7 +61,7 @@ msgstr "Gailu aldagarria"
 msgid "Path or mount point:"
 msgstr "Bide-izena edo muntatze-puntua:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Segurtasunaren eguneratzeak"
@@ -128,9 +128,9 @@ msgstr "Euskarri-mota:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Utzi"
@@ -139,10 +139,10 @@ msgstr "Utzi"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Ados"
@@ -323,8 +323,8 @@ msgstr "Euskarrien muga"
 msgid "Command"
 msgstr "Komandoa"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(bat ere ez)"
@@ -413,7 +413,7 @@ msgstr "Eguneratu euskarria"
 msgid "Regenerate hdlist"
 msgstr "Sortu berriro hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Itxaron, euskarria eguneratzen ari da..."
@@ -516,12 +516,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "%s euskarria behar bezala gehitu da."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Erabiltzaile-moduan ari da exekutatzen"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -532,568 +532,568 @@ msgstr ""
 "Ezingo duzu aldaketarik egin sisteman, \n"
 "baina uneko datu-basea arakatu ahal izango duzu."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Erabilerraztasuna"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Artxibatzen"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Babeskopia"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "CD grabaketa"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Konpresioa"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Bestelakoak"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Liburuak"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Informatikako liburuak"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "FAQ-ak"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "\"Nola\""
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Multzoa"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "Mezu Pasea"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "Ilara Zerbitzuak"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Komunikazioak"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Datu-baseak"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Garapena"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME eta GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE eta Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Nukleoa"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Editoreak"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Heziketa"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulatzaileak"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Fitxategi-tresnak"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Jokoak"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Abentura"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Makina-jokoak"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Mahai-jokoak"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kartak"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Puzzleak"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Kirolak"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Estrategia"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Mahaigain grafikoa"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM oinarri du"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Irudiak"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Kontrolatzen"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Sarea"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Berriketa"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Fitxategi-transferentzia"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Berehalako mezularitza"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Posta"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Berriak"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Urruneko atzipena"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Bulegoa"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Gako Publikoak"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Argitalpena"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Zientziak"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomia"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologia"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Kimika"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Informatika"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Lurraren zientziak"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fisika"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Shell-ak"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Soinua"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sistema"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Oinarria"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Abiarazi eta hasieratu"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Hardwarea"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Paketatzea"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Inprimatzen"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "Hedaketa"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Hedaketa"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Letra-tipoak"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Kontsola"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bit-mapa"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Nazioartekotzea"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Nukleoa eta hardwarea"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Liburutegiak"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Zerbitzariak"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminalak"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Testu-tresnak"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Jostagarriak"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Bideoa"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Ez dago erabilgarri)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Bilaketaren emaitzak"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Bilaketaren emaitzak (bat ere ez)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Itxaron, bilatzen ari da..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Gelditu"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Berritu daitekeena"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Gehi daitekeena"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Hautatuta"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Ez dago hautatuta"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Paketeari buruzko informazio gehiago..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Aukeratu"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ondoko paketeetako bat behar da:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Itxaron, paketeen zerrenda egiten ari da..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Eguneratzerik ez"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1105,28 +1105,28 @@ msgstr ""
 "paketeetarako ez duzula eguneratzerik erabilgarri, \n"
 "edo lehendik guztiak instalatuta dituzula."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Denak"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Informazio gehiago"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Paketeei buruzko informazioa"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Pakete osagarri batzuk ere kendu egin behar dira"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1136,12 +1136,12 @@ msgstr ""
 "Mendekotasunak direla eta, pakete hauek ere kendu egin behar dira:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Pakete batzuk ezin dira kendu"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1150,7 +1150,7 @@ msgstr ""
 "Pakete hauek kentzen badituzu, zure sistema hondatu egin liteke:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1160,12 +1160,12 @@ msgstr ""
 "Mendekotasunak direla eta, pakete hauek ezin dira hautatu orain:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Pakete osagarriak behar dira"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1176,17 +1176,17 @@ msgstr ""
 "egin behar dira:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (alde batera utzitakoen zerrendari dagokio)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Pakete batzuk ezin dira instalatu"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1197,132 +1197,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Pakete batzuk kendu egin behar dira"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Hautatuta: %d MB / Leku librea diskoan: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Hautatutako tamaina: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Deskribapena ez dago eskuragarri pakete honentzako\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Fitxategiak:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Euskarria: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Unean instalatutako bertsioa: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Izena: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Bertsioa: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Tamaina: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Garrantzia: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Laburpena: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Eguneratzeko arrazoia: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Azalpena: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Akats-konponketen eguneratzeak"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Eguneratze arruntak"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux-ren aukerak"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Pakete guztiak, alfabetikoki"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Pakete guztiak, taldearen arabera"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Pakete guztiak, tamainaren arabera"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Pakete guztiak, hautapen-egoeraren arabera"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Pakete guztiak, euskarri-biltegiaren arabera"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Pakete guztiak, eguneratzeen erabilgarritasunaren arabera"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Hostoak bakarrik, instalatze-dataren arabera sailkatuta"
@@ -1352,7 +1357,7 @@ msgstr "Berrezarri hautapena"
 msgid "Reload the packages list"
 msgstr "Birkargatu paketeen zerrenda"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Eguneratu euskarriak"
@@ -1767,6 +1772,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1780,158 +1790,181 @@ msgstr ""
 "CDROM edo DVDan. Tresna hau lagungarria izango zaizu ordenagailuan\n"
 "instalatu nahi duzun softwarea aukeratzeko."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Software Paketeen Eguneraketa"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Ez"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Bai"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Informazioa..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgika"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Txekiar Errepublika"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Alemania"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Danimarka"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grezia"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Espainia"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Frantzia"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japonia"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Herbehereak"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norvegia"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Errusia"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Erresuma Batua"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Txina"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Estatu Batuak"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Mandrakesoft-en web gunera joan behar dut ispiluen zerrenda lortzeko.\n"
+"Egiaztatu sarea unean martxan dagoela.\n"
+"\n"
+"Jarraitu nahi duzu?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1944,18 +1977,38 @@ msgstr ""
 "\n"
 "Jarraitu nahi duzu?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Itxaron, ispiluen helbideak deskargatzen Mandrakesoft-en web gunetik."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Itxaron, ispiluen helbideak deskargatzen Mandrakesoft-en web gunetik."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Errorea deskargatzean"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Errorea gertatu da ispiluen zerrenda deskargatzean:\n"
+"\n"
+"%s\n"
+"Baliteke sarea edo Mandrakesoft-en web gunea erabilgarri ez egotea.\n"
+"Saiatu berriro geroago."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1970,12 +2023,17 @@ msgstr ""
 "Baliteke sarea edo Mandrakesoft-en web gunea erabilgarri ez egotea.\n"
 "Saiatu berriro geroago."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Ez dago ispilurik"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1990,63 +2048,63 @@ msgstr ""
 "prozesadorearen arkitektura Mandrakelinux Eguneratze Ofizialak ez onartzea\n"
 "da."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Aukeratu nahi duzun ispilua."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' euskarrirako fitxategia kopiatzen..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "`%s' euskarriaren fitxategia aztertzen..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "`%s' euskarriaren fitxategia aztertzen..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " eginda."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " huts egin du!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s, %s euskarritik"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "`%s'(r)en deskarga abiarazten..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, 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:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s'(r)en deskarga, abiadura:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Akatsa paketeak eskuratzerakoan"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2062,17 +2120,17 @@ msgstr ""
 "ondoren berriro berkonfiguratzeko, edo une honetan ezin da atzeman\n"
 "eta beranduago saiatu behar zenuke berriro."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Hautatu eguneratu nahi duzun euskarria:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Eguneratu"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2085,7 +2143,7 @@ msgstr ""
 "Erroreak:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2096,17 +2154,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Ezin da euskarria sortu."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Ezin izan da euskarria gehitu"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2117,7 +2175,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"Zure '%s' euskarria, eguneratzeko erabilia, ez dator bat ibiltzen ari zaren "
+"Mandrakelinuxen bertsioarekin (%s).\n"
+"Ezgaitu egingo da."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2386,10 +2455,6 @@ msgstr "Transferentzia-kodetze ezezaguna\n"
 msgid "Unknown error code %d\n"
 msgstr "%d errore-kode ezezaguna\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Instalatu softwarea"
diff --git a/po/fa.po b/po/fa.po
index ea5837b8..bc64debc 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fa\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-09-26 15:19+0330\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -56,7 +56,7 @@ msgstr "دستگاه قابل انتقال"
 msgid "Path or mount point:"
 msgstr "مسیر یا نقطه سوارسازی:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "بروزسازی‌های امنیتی"
@@ -123,9 +123,9 @@ msgstr "نوع رسانه:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "لغو"
@@ -134,10 +134,10 @@ msgstr "لغو"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "تأیید"
@@ -318,8 +318,8 @@ msgstr "محدوده رسانه"
 msgid "Command"
 msgstr "فرمان"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(هیچکدام)"
@@ -408,7 +408,7 @@ msgstr "بروزسازی رسانه"
 msgid "Regenerate hdlist"
 msgstr "تولید مجدد hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "لطفا صبر کنید، در حال بروزسازی رسانه..."
@@ -509,12 +509,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "رسانه‌ی '%s' با موفقیت اضافه شد."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "در حال اجرا در حالت کاربری"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -525,568 +525,568 @@ msgstr ""
 "شما قادر نخواهید بود تغییراتی را بر سیستم انجام دهید، ولی هنوز\n"
 "می‌توانید پایگاه داده‌ی موجود را مرور کنید."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "قابل دست‌یابی"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "بایگانی"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "ذخیره‌ی پشتیبان"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "نگارش سی‌دی"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "فشرده‌سازی"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "دیگری"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "کتاب‌ها"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "کتاب‌های رایانه"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "پرسش‌های مداوم"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "چگونگی‌ها"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "نوشتجات"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "رد و بدل پیغام"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "سرویس‌های صف"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "ارتباطات"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "پایگاه‌های داده"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "برنامه‌سازی"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME و GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "جاوا"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE و Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "هسته"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "ویرایشگرها"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "آموزش"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "شبیه‌سازها"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "ابزار پرونده"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "بازی‌ها"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "ماجرا"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "آرکید"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "تخته‌ها"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "ورق‌ها"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "پازل‌ها"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "ورزش‌ها"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "تاکتیک"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "رومیزی گرافیکی"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "بر پایه‌ی FVWM"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "گنوم"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "اره‌ماهی"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "گرافیک‌ها"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "پایشگری"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "چندرسانه‌ای"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "شبکه‌کاری"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "گپ"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "انتقال‌ پرونده"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "پیغام‌رسانی آنی"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "پست"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "اخبار"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "دسترسی از دور دست"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "وب"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "دفتر"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "کلیدهای عمومی"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "منتشر کردن"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "دانش‌ها"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "نجوم"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "زیست‌شناسی"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "شیمی"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "دانش رایانه‌ای"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "دانش زمین‌شناسی"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "ریاضیات"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "فیزیک"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "پوسته‌ها"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "صوت"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "سیستم"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "پایه"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "پیکربندی"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "آغازگری و مقداردهی"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "سخت‌افزار"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "بسته‌بندی"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "چاپ"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "گسترش"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "گسترش"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "قلم‌ها"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "کنسول"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "نوع حقیقی"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "نوع۱"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "بین‌المللی کردن"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "هسته و سخت‌افزار"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "کتابخانه‌ها"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "کارگزارها"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "پایانه‌ها"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "ابزار متن"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "اسباب‌بازی‌ها"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "ویدیو"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(وجود ندارد)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "نتایج جستجو"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "نتایج جستجو (هیچ)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "لطفا صبر کنید، در حال جستجو..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "توقف"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "قابل ارتقاء"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "قابل افزودن"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "انتخاب شده"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "انتخاب نشده"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "اطلاعات بیشتر درباره‌ی بسته..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "لطفاً انتخاب کنید"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "یکی از بسته‌های به دنبال آمده مورد نیاز است:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "لطفا صبر کنید، در حال فهرست کردن بسته‌ها..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "بدون بروزسازی"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1097,28 +1097,28 @@ msgstr ""
 "به‌روزسازیی برای بسته‌ی نصب شده بر رایانه‌ی شما وجود ندارد یا شما\n"
 "قبلاً همه‌ی آنها را نصب کرده‌اید."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "همه"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "اطلاعات بیشتر"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "اطلاعات بسته‌ها"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "بعضی از بسته‌های اضافی لازم است برداشته شوند"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1129,12 +1129,12 @@ msgstr ""
 "برداشته شوند:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "بعضی از بسته‌ها نمی‌توانند برداشته شوند"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1143,7 +1143,7 @@ msgstr ""
 "برداشتن این بسته‌ها سیستم شما را می‌شکند، متأسفم:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1153,12 +1153,12 @@ msgstr ""
 "بسته‌های بدنبال آمده بخاطر وابستگی‌های آنها اکنون نباید انتخاب شوند:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "بسته‌های بیشتری لازم است"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1169,17 +1169,17 @@ msgstr ""
 "نصب شود:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (به لیست نادیده گیری تعلق دارد)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "بعضی از بسته‌ها نمی‌توانند نصب شوند"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1190,132 +1190,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "بعضی بسته‌ها لازم است برداشته شوند"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "انتخاب شده: %d مگابایت / فضای دیسک آزاد: %d مگابایت"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "اندازه‌ی انتخاب شده: %d مگابایت"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "توضیحی برای این بسته در دسترس نیست\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "پرونده‌ها:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "ثبت‌تغییرات:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "رسانه: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "نسخه‌ی نصب شده‌ی کنونی:"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "نام: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "نسخه: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "اندازه: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s کیلو‌بایت"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "اهمیت: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "خلاصه:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "دلیل برای بروزسازی:"
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "توصیف: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "بروزسازی‌های اشکال‌زدایی‌"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "بروزسازی‌های عادی"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "انتخاب‌های ماندرایک"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "همه‌ی بسته‌ها، الفبایی"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "همه‌ی بسته‌ها، بوسیله‌ی گروه"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "همه‌ی بسته‌ها، بوسیله اندازه"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "تمام بسته‌ها، بوسیله‌ی وضعیت انتخاب"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "همه‌ی بسته‌ها، بوسیله انبار رسانه"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "همه‌ی بسته‌ها، بوسیله در دسترسی بروزسازی آنها"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "فقط مرتب شده با تاریخ نصب باقی بماند"
@@ -1345,7 +1350,7 @@ msgstr "بازنشاندن انتخاب"
 msgid "Reload the packages list"
 msgstr "بارگذاری مجدد لیست بسته‌ها"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "رسانه‌ی بروزسازی"
@@ -1484,7 +1489,7 @@ msgstr ""
 "نرم‌افزار را برای به کار انداختن حداقل یکی از آنها اجرا کنید\n"
 " (آن را در ستون به‌کار‌افتاده؟ کنترل کنید).\n"
 "\n"
-"پس از آن بروزسازی ماندرایک را دوباره شروع کنید."
+"پس از آن %s را دوباره شروع کنید."
 
 #: ../rpmdrake:1140
 #, c-format
@@ -1505,7 +1510,7 @@ msgstr ""
 "مدیر رسانه‌ی نرم‌افزار را اجرا کرده و سپس یک رسانه‌ی بروزسازی امنیتی\n"
 "را اضافه کنید.\n"
 "\n"
-"پس از آن بروزسازی ماندرایک را دوباره شروع کنید."
+"پس از آن %s را دوباره شروع کنید."
 
 #: ../rpmdrake:1170
 #, c-format
@@ -1754,13 +1759,18 @@ msgid ""
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 msgstr ""
-"به بروزسازی ماندرایک خوش آمدید!\n"
+"به %s خوش آمدید!\n"
 "\n"
 "این ابزار به شما در انتخاب بروزسازی‌هایی که می‌خواهید بر رایانه خود نصب\n"
 "کنید کمک خواهد کرد."
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1774,158 +1784,181 @@ msgstr ""
 "می‌شود. این ابزار به شما در انتخاب نرم‌افزاری که می‌خواهید بر رایانه‌ی خود نصب\n"
 "کنید کمک خواهد کرد."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "بروزسازی بسته‌های نرم‌افزار"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "بروزسازی ماندرایک"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "نه"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "بله"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "اطلاعات..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "اطریش"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "استرالیا"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "بلژیک"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "برزیل"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "کانادا"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "کوستا ریکا"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "جمهوری چک"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "آلمان"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "دانمارک"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "یونان"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "اسپانیا"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "فنلاند"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "فرانسه"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "اسرائیل"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "ایتالیا"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "ژاپن"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "کره"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "هلند"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "نروژ"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "لهستان"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "پرتغال"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "روسیه"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "سوئد"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "تایوان"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "بریتانیا"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "چین"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "ایالات متحده"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"برای دریافت لیست آینه‌ها مجبورم با وب‌گاه ماندرایک‌سافت تماس بگیرم.\n"
+"لطفاً کنترل کنید که شبکه شما اکنون در حال اجرا می‌باشد.\n"
+"\n"
+"آیا ادامه دهیم؟"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1938,18 +1971,38 @@ msgstr ""
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "لطفاً صبر کنید، در حال بارگیری نشانی‌های آینه‌ها از وبگاه ماندرایک‌سافت."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "لطفاً صبر کنید، در حال بارگیری نشانی‌های آینه‌ها از وبگاه ماندرایک‌سافت."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "خطا هنگام بارگیری"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"هنگام بارگیری لیست آینه‌ها یک خطا وجود داشت:\n"
+"\n"
+"%s\n"
+"شبکه یا وبگاه ماندرایک‌سافت شاید در دسترس نباشند.\n"
+"لطفاً بعداً دوباره امتحان کنید."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1964,12 +2017,17 @@ msgstr ""
 "شبکه یا وبگاه ماندرایک‌سافت شاید در دسترس نباشند.\n"
 "لطفاً بعداً دوباره امتحان کنید."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "هیچ آینه‌ای"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1984,63 +2042,63 @@ msgstr ""
 "بدلیل عدم حمایت از ساختار پردازه‌گر شما بوسیله‌ی به‌روزسازی‌های رسمی\n"
 "لینوکس ماندرایک می‌باشد."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "لطفاً آینه‌ی مورد نظرتان را انتخاب کنید."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "کپی کردن پرونده برای رسانه `%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "آزمایش کردن پرونده‌ی رسانه‌ی `%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "در حال آزمایش کردن پرونده‌ی دور دست رسانه‌ی `%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " انجام شد."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " شکست خورد!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s از رسانه‌ی %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "در حال شروع بارگیری `%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "بارگیری `%s'، زمان باقیمانده: %s، سرعت:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "بارگیری `%s'، سرعت:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "خطا در دریافت بسته‌ها"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2057,17 +2115,17 @@ msgstr ""
 " کنید، یا آن اکنون در دسترس نیست و شما باید بعداً دوباره امتحان\n"
 " کنید. "
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "انتخاب کردن رسانه‌ای که می‌خواهید بروزسازی کنید:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "بروزسازی"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2080,7 +2138,7 @@ msgstr ""
 "خطاها:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2091,17 +2149,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "نمی‌توانم رسانه را ایجاد کنم."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "ناموفق بودن هنگام اضافه کردن رسانه"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2112,7 +2170,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"رسانه‌ی شما `%s'، که برای بروزسازی استفاده می‌شود، با نسخه‌ی لینوکس ماندرایکی "
+"که شما اجرا می‌کنید (%s) تطابق ندارد.\n"
+"آن از کار انداخته خواهد شد."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2381,10 +2450,6 @@ msgstr "رمزگزاری انتقال ناشناخته\n"
 msgid "Unknown error code %d\n"
 msgstr "کد خطای ناشناس %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "بروزسازی ماندرایک"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "نصب نرم‌افزار"
diff --git a/po/fi.po b/po/fi.po
index 31874194..759ddfb7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fi - MDK 10.1 Release\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-09-05 18:31+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <cooker-i18n@mandrakelinux.com>\n"
@@ -62,7 +62,7 @@ msgstr "Siirrettävä laite"
 msgid "Path or mount point:"
 msgstr "Polku tai liitoskohta:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Tietoturvapäivitykset"
@@ -129,9 +129,9 @@ msgstr "Lähteen tyyppi:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Peruuta"
@@ -140,10 +140,10 @@ msgstr "Peruuta"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -325,8 +325,8 @@ msgstr "Lähderajoitus"
 msgid "Command"
 msgstr "Komento"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(tyhjä)"
@@ -415,7 +415,7 @@ msgstr "Päivitä lähteet"
 msgid "Regenerate hdlist"
 msgstr "Luo hdlist uudelleen"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Odota, päivitetään lähteet..."
@@ -517,12 +517,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Ohjelmistolähde `%s' lisättiin onnistuneesti."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Suoritetaan käyttäjätilassa"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -533,568 +533,568 @@ msgstr ""
 "Et voi suorittaa muutoksia järjestelmään, mutta \n"
 "voit selata olemassa olevaa tietokantaa."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Käytettävyys"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Arkistointi"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Varmistus"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "CD:n poltto"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Pakkaus"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Muu"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Kirjat"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Tietokonekirjat"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Faq"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howto"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Kirjallisuus"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Ryväs"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "Viestinvälitys"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "Jonotuspalvelut"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Viestintä"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Tietokannat"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Kehitys"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME ja GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE ja Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Ydin"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Editorit"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Opiskelu"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulaattorit"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Tiedostotyökalut"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Pelit"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Seikkailu"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Lautapelit"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kortti"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Ongelmanratkonta"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Urheilu"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategia"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Graafinen työpöytä"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM-pohjainen"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "IceWM"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafiikka"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Valvonta"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Verkko"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Tiedostonsiirto"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Pikaviestintä"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Sähköposti"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Uutiset"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Etäkäyttö"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Toimisto"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Julkiset avaimet"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Julkaisu"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Tiede"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomia"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologia"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Kemia"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Tietokoneet"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geotieteet"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematiikka"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fysiikka"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Komentotulkit"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Ääni"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Järjestelmä"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Perus"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Käynnistys ja alustus"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Laitteisto"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Pakkaus"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Tulostus"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "Sijoitus"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Sijoitus"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Kirjasimet"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Pääte"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bittikartta"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Kansainvälistäminen"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Ydin ja laitteisto"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Kirjastot"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Palvelimet"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Päätteet"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Tekstityökalut"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Lelut"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Ei käytettävissä)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Haun tulokset"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Haun tulokset (ei mitään)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Odota, etsitään..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Päivitettävissä"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Lisättävissä"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Valittu"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Ei valittu"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Lisätietoa paketista..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Ole hyvä ja valitse"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Yksi seuraavista paketeista tarvitaan:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Odota, listataan paketteja..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Ei päivityksiä"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1104,28 +1104,28 @@ msgstr ""
 "Päivityslista on tyhjä. Tämä tarkoittaa joko ettei\n"
 "päivityksiä löydy, tai olet jo asentanut kaikki."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Kaikki"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Lisätietoa"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Lisätietoa paketista"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Joitakin paketteja pitää poistaa tämän lisäksi"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1135,12 +1135,12 @@ msgstr ""
 "Riippuvuuksien vuoksi myös seuraavat paketit joudutaan poistamaan:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Joitakin paketteja ei voida poistaa"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1149,7 +1149,7 @@ msgstr ""
 "Näiden pakettien poistaminen valitettavasti rikkoisi järjestelmäsi:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1160,12 +1160,12 @@ msgstr ""
 "nyt poistamaan valinnasta:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Lisäpaketteja vaaditaan"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1176,17 +1176,17 @@ msgstr ""
 "pitää asentaa:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (on ohitettavien listalla)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Joitakin paketteja ei voida asentaa"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1197,132 +1197,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Joitakin paketteja pitää poistaa"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valitut: %d Mt / Vapaata levytilaa: %d Mt"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Valittujen koko: %d Mt"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Paketin kuvaus ei ole saatavilla\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Tiedostot:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Muutosloki:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Lähde: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Asennettu versio: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Nimi: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Versio: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Koko: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s kt"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Tärkeys: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Yhteenveto: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Syy päivitykseen: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Kuvaus: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Virhekorjaukset"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Tavalliset päivitykset"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux valinnat"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Kaikki paketit, aakkosjärjestyksessä"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Kaikki paketit, ryhmän mukaan"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Kaikki paketit, koon mukaan"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Kaikki paketit, valinnan mukaan"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Kaikki paketit, lähteiden mukaan"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Kaikki paketit, päivityksien saatavuuden mukaan"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Jäämistöt, eriteltynä asennuspäivämäärän mukaan"
@@ -1352,7 +1357,7 @@ msgstr "Palauta valinnat"
 msgid "Reload the packages list"
 msgstr "Lataa pakettilista uudelleen"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Päivitä lähteet"
@@ -1769,6 +1774,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1782,158 +1792,181 @@ msgstr ""
 "CD- tai DVD-levy(i)llä. Tämä ohjelma auttaa sinua valitsemaan\n"
 "ohjelmia joita haluat asentaa tietokoneeseesi."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Ohjelmistopakettien päivitys"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Ei"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Tietoja..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Itävalta"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasilia"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Tsekki"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Saksa"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Tanska"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Kreikka"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Espanja"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Suomi"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Ranska"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japani"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Alankomaat"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norja"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Puola"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugali"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Venäjä"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Kiina"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Yhdysvallat"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Peilipalvelinlistan saamiseksi tarvitaan yhteys Mandrakesoftin\n"
+"webbisivustoon. Varmista että verkkoyhteytesi on avattu.\n"
+"\n"
+"Sopiiko että jatketaan?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1946,18 +1979,38 @@ msgstr ""
 "\n"
 "Sopiiko että jatketaan?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Odota, haetaan lista peilipalvelimista Mandrakesoftin webbisivustosta."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Odota, haetaan lista peilipalvelimista Mandrakesoftin webbisivustosta."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Virhe latauksen aikana"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Haettaessa listaa peilipalvelimista ilmeni virhe:\n"
+"\n"
+"%s\n"
+"Verkkoyhteytesi tai Mandrakesofi:n webbisivusto ei ole saatavilla.\n"
+"Yritä myöhemmin uudelleen."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1972,12 +2025,17 @@ msgstr ""
 "Verkkoyhteytesi tai Mandrakesofi:n webbisivusto ei ole saatavilla.\n"
 "Yritä myöhemmin uudelleen."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Ei peilipalvelinta"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1992,63 +2050,63 @@ msgstr ""
 "että käyttämäsi suoritin-arkkitehtuuri ei ole tuettu\n"
 "virallisissa Mandrakelinux päivityksissä."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Ole hyvä ja valitse haluttu peilipalvelin."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopioidaan lähteen `%s' tiedostoa..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Tarkistetaan lähteen `%s' tiedostoa..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Tarkistetaan lähteen `%s' etätiedostoa..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " valmis."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " epäonnistui!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s lähteeltä %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Aloitetaan `%s' lataaminen..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Ladataan `%s', aikaa jäljellä:%s, nopeus:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Ladataan `%s', nopeus:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Virhe noudettaessa paketteja"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2064,17 +2122,17 @@ msgstr ""
 "oikein asetettuna - tai se on tilapäisesti poistettu käytöstä\n"
 "jolloin voit yrittää myöhemmin uudelleen."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Valitse lähteet, jotka haluat päivittää:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Päivitä"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2087,7 +2145,7 @@ msgstr ""
 "Virheet:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2098,17 +2156,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Lähteen luominen epäonnistui."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Virhe lisättäessä lähdettä"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2119,7 +2177,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"Päivityksiin käytetävä lähde `%s' ei vastaa käyttämääsi Mandrakelinuxin "
+"versiota (%s).\n"
+"Lähde poistetaan käytöstä."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2388,10 +2457,6 @@ msgstr "Tunnistamaton siirron koodaus\n"
 msgid "Unknown error code %d\n"
 msgstr "Tuntematon virhekoodi %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Asenna ohjelmia"
diff --git a/po/fr.po b/po/fr.po
index 8a22bb01..2aaab1cd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fr\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-08-13 21:44+0200\n"
 "Last-Translator: Lecureuil Nicolas <n1c0l4s.l3@wanadoo.fr>\n"
 "Language-Team: francais <fr@li.org>\n"
@@ -68,7 +68,7 @@ msgstr "Périphérique amovible"
 msgid "Path or mount point:"
 msgstr "Chemin ou point de montage :"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Mises à jour de sécurité"
@@ -135,9 +135,9 @@ msgstr "Type de média :"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Annuler"
@@ -146,10 +146,10 @@ msgstr "Annuler"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -336,8 +336,8 @@ msgstr "Limité aux médias"
 msgid "Command"
 msgstr "Commande"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(aucun)"
@@ -426,7 +426,7 @@ msgstr "Mettre à jour le média"
 msgid "Regenerate hdlist"
 msgstr "Regénerer l'hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Veuillez patienter, mise à jour des médias..."
@@ -531,12 +531,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Média `%s' ajouté avec succès."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Fonctionnement en utilisateur normal"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -547,568 +547,568 @@ msgstr ""
 "Vous ne pourrez pas effectuer de modifications sur le système,\n"
 "par contre vous pourrez parcourir la base de données existante."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Accessibilité"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Archivage"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Sauvegarde"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Gravure de CD"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Compression"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Autre"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Livres"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Livres informatiques"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Faqs"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Littérature"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "Transmission de Messages"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "Services de file d'attente"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Communication"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Bases de données"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Développement"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME et GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE et Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Noyau"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Éditeurs"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Éducation"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Émulateurs"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Outils fichiers"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Jeux"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Aventure"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Plateau"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Cartes"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Énigmes"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sports"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Stratégie"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Environnement graphique"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM et dérivés"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Graphisme"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Surveillance"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimédia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Réseau"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Discussion"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Transfert de fichiers"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Messagerie instantanée"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Courrier électronique"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Accès distant"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Bureautique"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Clés Publiques"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Publication"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Sciences"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomie"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologie"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Chimie"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Informatique"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Géosciences"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Mathématiques"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Physique"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Interpréteurs de commandes"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Son"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Système"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Démarrage"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Matériel"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Empaquetage"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Impression"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "Déploiement"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Déploiement"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Fontes"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Console"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Internationalisation"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Noyau et matériel"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Bibliothèques"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Serveurs"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminaux"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Outils texte"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Jouets"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Vidéo"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Non disponible)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Résultats de la recherche"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Résultats de la recherche (aucun)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Veuillez patienter, recherche en cours..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Arrêter"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Mises à jour"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Nouveaux"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Sélectionnés"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Non sélectionnés"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Plus d'informations sur le paquetage..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Veuillez choisir"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "L'un des paquetages suivants est nécessaire :"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Veuillez patienter, énumération des paquetages..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Pas de mise à jour"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1119,28 +1119,28 @@ msgstr ""
 "pas de mises à jour pour les paquetages installés sur votre\n"
 "ordinateur, ou bien que vous les avez déjà toutes installées."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Tous"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Plus d'infos"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Informations sur les paquetages"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Des paquetages supplémentaires doivent être supprimés"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1152,12 +1152,12 @@ msgstr ""
 "doivent aussi être supprimés :\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Des paquetages ne peuvent pas être supprimés"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1166,7 +1166,7 @@ msgstr ""
 "Le fait d'enlever ce paquetage rendrait instable votre système, désolé :\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1177,12 +1177,12 @@ msgstr ""
 "doivent être déselectionnés :\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Des paquetages supplémentaires sont nécessaires"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1193,17 +1193,17 @@ msgstr ""
 "doivent aussi être installés :\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (appartient à la liste des fichiers ignorés)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Certains paquetages ne peuvent pas être installés"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1214,132 +1214,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Certains paquetages doivent être enlevés"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Sélectionnés : %d Mo / Place libre sur disque :%d Mo"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Taille sélectionnée :%d Mo"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "La description n'est pas disponible pour ce paquetage\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Fichiers :\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Changelog :\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Média : "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Version actuellement installée : "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Version : "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Taille : "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s Ko"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Importance : "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Intitulé : "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Raison de la mise à jour :"
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Description : "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Corrections de bogues"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Mises à jour normales"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Choix Mandrakelinux"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Tous les paquetages, classement alphabétique"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Tous les paquetages, par groupe"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Tous les paquetages, par taille"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Tous les paquetages, sélectionnés ou non"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Tous les paquetages, par média"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Tous les paquetages, nouveaux ou mis à jour"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Les feuilles seulement, par date d'installation"
@@ -1369,7 +1374,7 @@ msgstr "Remettre à zéro la sélection"
 msgid "Reload the packages list"
 msgstr "Rafraîchir la liste des paquetages"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Mise à jour de médias"
@@ -1790,6 +1795,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1804,158 +1814,182 @@ msgstr ""
 "à choisir quels logiciels vous désirez installer sur votre\n"
 "ordinateur."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Mise à jour de Paquetages Logiciels"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mise à jour Mandrakelinux"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Non"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Oui"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Autriche"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australie"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgique"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brésil"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "République Tchèque"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Allemagne"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Danemark"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grèce"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Espagne"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finlande"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "France"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israël"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Italie"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japon"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Corée"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Pays-Bas"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norvège"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Pologne"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Russie"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Suède"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taïwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Royaume-Uni"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Chine"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "États-Unis"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"J'ai besoin de contacter le site web de Mandrakesoft, afin d'obtenir la "
+"liste des miroirs.\n"
+"Veuillez vérifier que le réseau est en fonctionnement.\n"
+"\n"
+"Êtes-vous d'accord pour continuer ?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1969,7 +2003,14 @@ msgstr ""
 "\n"
 "Êtes-vous d'accord pour continuer ?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Veuillez patienter, téléchargement de la liste des miroirs à partir du site "
+"web de Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
@@ -1977,12 +2018,28 @@ msgstr ""
 "Veuillez patienter, téléchargement de la liste des miroirs à partir du site "
 "web de Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Erreur pendant le téléchargement"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Une erreur est survenue pendant le téléchargement de la liste des miroirs :\n"
+"\n"
+"%s\n"
+"Le réseau, ou bien le site web de Mandrakesoft, sont peut-être "
+"indisponibles.\n"
+"Veuillez réessayer ultérieurement."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1998,12 +2055,17 @@ msgstr ""
 "indisponibles.\n"
 "Veuillez réessayer ultérieurement."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Pas de miroir"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2018,63 +2080,63 @@ msgstr ""
 "d'entre elles est que l'architecture de votre processeur n'est\n"
 "pas supportée par les Mises à jour Officielle Mandrakelinux."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Veuillez choisir le miroir."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copie du fichier pour le média `%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Examen du fichier du média `%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Examen du fichier distant du média `%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " fini."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " échec !"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s à partir du média %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Démarrage du téléchargement de `%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Téléchargement de `%s', temps :%s, vitesse :%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Téléchargement de `%s', vitesse :%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Erreur lors de la récuparation des paquetages"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2090,17 +2152,17 @@ msgstr ""
 "de l'enlever puis de le rajouter afin de le reconfigurer), soit il est\n"
 "actuellement inaccessible et vous devriez réessayer plus tard."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Veuillez choisir les médias que vous voulez mettre à jour :"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2113,7 +2175,7 @@ msgstr ""
 "Erreurs :\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2124,17 +2186,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Impossible de créer le média."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Échec lors de l'ajout du média"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2145,7 +2207,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"Votre média `%s', utilisé pour les mises-à-jours ,ne correspond pas a la "
+"version de Mandrakelinux que vous utilisez (%s).\n"
+"Il va être desactivé."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2414,10 +2487,6 @@ msgstr "Encodage de transfert non reconnu\n"
 msgid "Unknown error code %d\n"
 msgstr "Code d'erreur inconnu %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mise à jour Mandrakelinux"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Installer des Logiciels"
diff --git a/po/fur.po b/po/fur.po
index de952fc9..ba29ec9a 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fur\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-05-18 14:42+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -56,7 +56,7 @@ msgstr "Periferiche rimovibil"
 msgid "Path or mount point:"
 msgstr "Percors o pont di mount:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Atualizazions pe sigurece"
@@ -123,9 +123,9 @@ msgstr "Sorte di font:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Scancele"
@@ -134,10 +134,10 @@ msgstr "Scancele"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -320,8 +320,8 @@ msgstr "Limit fonts"
 msgid "Command"
 msgstr "Comant"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(nissun)"
@@ -410,7 +410,7 @@ msgstr "Atualize fonts"
 msgid "Regenerate hdlist"
 msgstr "Torne a creâ hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Par plasè spiete, atualizazion des fonts in vore..."
@@ -514,12 +514,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Font zontade cun sucès `%s'."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "In esecuzion in maniere utent"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -530,568 +530,568 @@ msgstr ""
 "No tu puedarâs fa modificazions al sisteme, ma\n"
 "tu podarâs distès cjalâ tai database esistints."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Acessibilitât"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Archiviâmint"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Scritôrs di CD"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Compression"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Altri"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Libris"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Libris di informatiche"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Faq"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howto"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Leterature"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Comunicazions"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Database"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Svilup"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME e GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE e QT"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Editôrs"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Comunicazions"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Similadôrs"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Imprescj file"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Zûcs"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Aventure"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Zûcs di taule"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Cjartis"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Berdeis"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategjie"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Desktop grafic"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "Basât su FVWM"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafiche"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Monitorament"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Rêt"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Stramude file"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Mes istantanis"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Mail"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Acès Rimît"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Ufizi"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Publishing"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Siencis"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomie"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologjie"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Chimiche"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Informatiche"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Siencis de Tiere"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematiche"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fisiche"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Sunôr"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sisteme"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Configurazion"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Inviament e Init"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Pachets"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Stampe"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Svilup"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Svilup"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Sortis di caratar"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Console"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "Bitmap X11"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Internazionalizazion"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel e hardware"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Librariis"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Server"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminâi"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Imprescj par scrivi"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Zûcs par fruts"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(No disponibil)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Risultâts de ricercje"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Risultâts de ricercje (nissun)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Par plasè spiete, ricercje in vore..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Ferme"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Atualizabil"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Zontabil"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Selezionât"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "No selezionât"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Plui informazions sul pachet..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Par plasè sielç"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Al covente un di chescj pachets:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Par plasè spiete, in vore l'ordinament dai pachets..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Nissune atualizazion"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1102,28 +1102,28 @@ msgstr ""
 "no son atualizazions disponibilis par i pachets instalâts tal to computer\n"
 "o che tu les âs dizà instaladis dutis."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Ducj"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Plui informazions"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Informazions sui pachets"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "E a di sedi rimovût cualchi pachet in plui"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1134,12 +1134,12 @@ msgstr ""
 "rimovûts:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Cualchi pachet nol po sedi rimovût"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1148,7 +1148,7 @@ msgstr ""
 "Mi splâs, ma rimovi chescj pachets al prejudicarès il to sisteme:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1159,12 +1159,12 @@ msgstr ""
 "sedi deselezionâts daurman:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "E coventin altris pachets"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1175,17 +1175,17 @@ msgstr ""
 "instalâts:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Cualchi pachet nol po sedi instalât"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1196,132 +1196,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Cualchi pachet al à di sedi rimovût"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Selezionâts: %d MB / Spazi libar su disc: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Dimension selezionade: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "File:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Regjistri des modificazions\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Font: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Version ore presint instalade: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Non: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Version: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Dimension: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Entitât: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Sumari: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Reson de atualizazion: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Descrizion: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Atualizazions coretivis"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Atualizazions normalis"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Sieltis di Mandrakelinux"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Ducj i pachets, in ordin alfabetic"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Ducj i pachets, in ordin di grop"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Ducj i pachets, in ordin di dimension"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Ducj i pachets, in ordin di stât di selezion"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Ducj i pachets, in ordin di font"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Ducj i pachets, in ordin di disponibilitât di atualizazions"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Dome fueis, in ordin di date di instalazion"
@@ -1351,7 +1356,7 @@ msgstr "Scancele le selezion"
 msgid "Reload the packages list"
 msgstr "Torne a cjariâ le liste dai pachets"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Atualize fonts"
@@ -1770,6 +1775,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1783,158 +1793,182 @@ msgstr ""
 "software su CDROM o DVD. Chest program a ti judarâ a sielzi cuâl software\n"
 "tu vuelis instalâ tal to computer."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Rimozion Pachets Software"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "No"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Si"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Informazions..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Austrie"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australie"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgjiche"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasîl"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Canadà"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Republiche ceche"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Gjermanie"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Danimarcje"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grecie"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Spagne"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finlandie"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "France"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israêl"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Italie"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Gjapon"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Coree"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Olande"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norvegje"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Polonie"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Russie"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Svezie"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Ream Unît"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Cine"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Stâts Unîts"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Al è di bisugne di contatâ il sît web di Mandrakesoft par vê le liste dai "
+"mirror.\n"
+"Par plasè controle che le to rêt e stedi lant.\n"
+"\n"
+"Vuelistu continuâ?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1948,7 +1982,14 @@ msgstr ""
 "\n"
 "Vuelistu continuâ?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Par plasè spiete, o stoi scjariant i recapits dai mirror dal sît di "
+"Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
@@ -1956,12 +1997,27 @@ msgstr ""
 "Par plasè spiete, o stoi scjariant i recapits dai mirror dal sît di "
 "Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Fal tal scjiariament"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"A si è verificât un fal intant dal scjariament de liste dai mirror:\n"
+"\n"
+"%s\n"
+"Le rêt, o il sît web di Mandrakesoft, forsit no son disponibii.\n"
+"Par plasè prove daspò."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1976,12 +2032,17 @@ msgstr ""
 "Le rêt, o il sît web di Mandrakesoft, forsit no son disponibii.\n"
 "Par plasè prove daspò."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Nissun mirror"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1996,63 +2057,63 @@ msgstr ""
 "cuant che le architeture dal to procesôr no je sopuartade\n"
 "dalis Atualizazions Ofiziâlis Mandrakelinux."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Par plasè sielç il mirror preferît."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "O copii il file pe font `%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "O esamini i file de font `%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "O esamini il file rimît de font `%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " fat."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " falade!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s de font %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Inviament dal scjariament di `%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Scjariament di `%s', timp restât:%s, velocitât:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Scjariament di `%s', velocitât:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Fal cjapant i pachets"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2071,17 +2132,17 @@ msgstr ""
 "tornâ a provâ\n"
 "daspò."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Sielç le font che tu âs voie di atualizâ:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Atualize"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2094,7 +2155,7 @@ msgstr ""
 "Fai:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2105,17 +2166,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "No rivi a creâ le font."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Fal te zonte de font"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2126,7 +2187,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2392,10 +2461,6 @@ msgstr "Codifiche di stramude no cognossude\n"
 msgid "Unknown error code %d\n"
 msgstr "Codis di fal no cognosût %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Instale Software"
diff --git a/po/ga.po b/po/ga.po
index 9ad516c8..b80afe29 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2000-08-24 12:00-0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -57,7 +57,7 @@ msgstr ""
 msgid "Path or mount point:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, fuzzy, c-format
 msgid "Security updates"
 msgstr "Roghnaigh liebhéal slándáil"
@@ -122,9 +122,9 @@ msgstr ""
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Cealaigh"
@@ -133,10 +133,10 @@ msgstr "Cealaigh"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Ceart go Leor"
@@ -321,8 +321,8 @@ msgstr ""
 msgid "Command"
 msgstr "Ceanada"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(ar bith)"
@@ -413,7 +413,7 @@ msgstr ""
 msgid "Regenerate hdlist"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr ""
@@ -503,12 +503,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -516,574 +516,574 @@ msgid ""
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr ""
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr ""
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, fuzzy, c-format
 msgid "Backup"
 msgstr "Dubh"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr ""
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, fuzzy, c-format
 msgid "Compression"
 msgstr "Seisiún"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Eile"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, fuzzy, c-format
 msgid "Books"
 msgstr "Eile"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Cumarsáidí"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Bunachair Sonraí"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, fuzzy, c-format
 msgid "Development"
 msgstr "Forbairt/C"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr ""
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr ""
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, fuzzy, c-format
 msgid "GNOME and GTK+"
 msgstr "Forbairt/C++"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, fuzzy, c-format
 msgid "Java"
 msgstr "An tSeapáin"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, fuzzy, c-format
 msgid "KDE and Qt"
 msgstr "Forbairt/Eithne"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr ""
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Eagair"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Cumarsáidí"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Iomaitheoirí"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Uirlisí Chomaid"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, fuzzy, c-format
 msgid "Games"
 msgstr "Ainm"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Eachtra"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Stuara"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, fuzzy, c-format
 msgid "Boards"
 msgstr "Fidcheall"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Cartaí"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, fuzzy, c-format
 msgid "Puzzles"
 msgstr "Corcra"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Stratéis"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, fuzzy, c-format
 msgid "Graphical desktop"
 msgstr "Grafaic"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr ""
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr ""
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafaic"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Greasánú"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Ilmheánach"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, fuzzy, c-format
 msgid "Networking"
 msgstr "Lionrá"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, fuzzy, c-format
 msgid "Chat"
 msgstr "An tSín"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, fuzzy, c-format
 msgid "File transfer"
 msgstr "Líonra/Fóntais"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, fuzzy, c-format
 msgid "Instant messaging"
 msgstr "Líonra/Fóntais"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, fuzzy, c-format
 msgid "Mail"
 msgstr "An Bhrasail"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, fuzzy, c-format
 msgid "News"
 msgstr "nuacht"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, fuzzy, c-format
 msgid "Remote access"
 msgstr "Líonra/Deamhain"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Oifig"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Foilsitheoireacht"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Eolaíochtaí"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Réalteolaíocht"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Bitheolaíocht"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Ceimic"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Riomheolaíocht"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, fuzzy, c-format
 msgid "Geosciences"
 msgstr "Eolaíochtaí"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Mathemaitce"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fisic"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Blaoscanna"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Fuaim"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, fuzzy, c-format
 msgid "System"
 msgstr "Córas/Bun"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr ""
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, fuzzy, c-format
 msgid "Configuration"
 msgstr "Cumarsáidí"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Tosnú"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Crua-earraí"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr ""
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, fuzzy, c-format
 msgid "Printing"
 msgstr "Rabhadh"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Forbairt/C"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Forbairt/C"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Chlofhoireanna"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Consóil"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, fuzzy, c-format
 msgid "True type"
 msgstr "Cinéal"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, fuzzy, c-format
 msgid "Type1"
 msgstr "Cinéal"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, fuzzy, c-format
 msgid "X11 bitmap"
 msgstr "Córas/Clófhoirne/True Type"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, fuzzy, c-format
 msgid "Libraries"
 msgstr "Córas/Leabharlanna"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, fuzzy, c-format
 msgid "Servers"
 msgstr "Córas/Leabharlanna"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, fuzzy, c-format
 msgid "XFree86"
 msgstr "Córas/Bun"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Teirminealanna"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Uirlisí Teacs"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Cluichí"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Fís"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, fuzzy, c-format
 msgid "Search results"
 msgstr "Cuardaigh"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, fuzzy, c-format
 msgid "Search results (none)"
 msgstr "Cuardaigh"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, fuzzy, c-format
 msgid "Please wait, searching..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, fuzzy, c-format
 msgid "Stop"
 msgstr "Teascán"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, fuzzy, c-format
 msgid "Addable"
 msgstr "Ag Feistiú"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, fuzzy, c-format
 msgid "Selected"
 msgstr ""
 "Tóg\n"
 "gach rud"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, fuzzy, c-format
 msgid "Not selected"
 msgstr "Tóg gach rud"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, fuzzy, c-format
 msgid "Rpmdrake %s"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, fuzzy, c-format
 msgid "Please choose"
 msgstr "Cinntigh, le do thoil"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, fuzzy, c-format
 msgid "Please wait, listing packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, fuzzy, c-format
 msgid "No update"
 msgstr "slí"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1091,28 +1091,28 @@ msgid ""
 "or you already installed all of them."
 msgstr ""
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Gach Rud"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, fuzzy, c-format
 msgid "Information on packages"
 msgstr "Teip ag oscailt pacáiste"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1120,19 +1120,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1140,12 +1140,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1153,17 +1153,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1171,132 +1171,137 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, fuzzy, c-format
 msgid "Files:\n"
 msgstr "/_Comhad"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, fuzzy, c-format
 msgid "Name: "
 msgstr "Ainm: %s"
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, fuzzy, c-format
 msgid "Version: "
 msgstr "Leagan:"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Meid"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, fuzzy, c-format
 msgid "Importance: "
 msgstr "Tábhacht: %s\n"
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Coimriú"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Réiteach:"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr ""
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr ""
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr ""
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr ""
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
@@ -1326,7 +1331,7 @@ msgstr ""
 msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, fuzzy, c-format
 msgid "Update media"
 msgstr ""
@@ -1695,6 +1700,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1703,162 +1713,181 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Bainisteóir Bóg-Earraí"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr ""
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Níl"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Tá"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "An Ostair"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "An Aistráil"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "An Bheilg"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "An Bhrasail"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Ceanada"
 
 # CR
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Cósta Rice"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "An Phoblacht nc tSeic"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "An Ghearmáin"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "An Ghréig"
 
 # ES
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "An Spáinn"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "An Fhionlainn"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "An Fhrainc"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Iosrael"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "An Iodáil"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "An tSeapáin"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, fuzzy, c-format
 msgid "Korea"
 msgstr "Mór"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "An Isiltír"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "An Iorua"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "An Pholainn"
 
 # PT
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "An Phortaingéil"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, fuzzy, c-format
 msgid "Russia"
 msgstr "Ruislís"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, fuzzy, c-format
 msgid "Sweden"
 msgstr "Amharc"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, fuzzy, c-format
 msgid "Taiwan"
 msgstr "Áit"
 
 # UK
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "An Ríocht"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "An tSín"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Stáit Aontaithe Mheiriceá"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1867,18 +1896,35 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Fan tamall\n"
+"Checking dependencies"
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1888,12 +1934,17 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, fuzzy, c-format
 msgid "No mirror"
 msgstr "Gan earraidh"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1903,63 +1954,63 @@ msgid ""
 "by Mandrakelinux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, fuzzy, c-format
 msgid " failed!"
 msgstr "teip ar 'mkraid'"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -1970,17 +2021,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr ""
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, fuzzy, c-format
 msgid "Update"
 msgstr "slí"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -1989,7 +2040,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -1997,17 +2048,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2015,7 +2066,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2285,10 +2344,6 @@ msgstr ""
 msgid "Unknown error code %d\n"
 msgstr "Cód earraidh gan aithne %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr ""
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 2d3d986c..3878ebeb 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-gl\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
-"PO-Revision-Date: 2004-05-06 20:31+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
+"PO-Revision-Date: 2004-10-23 12:11+0100\n"
 "Last-Translator: Leandro Regueiro <unho@gulo.org>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
@@ -53,14 +53,14 @@ msgstr "Servidor HTTP"
 #: ../edit-urpm-sources.pl:67
 #, c-format
 msgid "Removable device"
-msgstr "Dispositivo extraible"
+msgstr "Dispositivo extraíble"
 
 #: ../edit-urpm-sources.pl:67
 #, c-format
 msgid "Path or mount point:"
 msgstr "Ruta ou punto de montaxe:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Actualizacións de seguridade"
@@ -125,9 +125,9 @@ msgstr "Tipo de soporte:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
@@ -136,10 +136,10 @@ msgstr "Cancelar"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
@@ -251,12 +251,12 @@ msgstr ""
 #: ../edit-urpm-sources.pl:414
 #, c-format
 msgid "Add a host"
-msgstr ""
+msgstr "Engadir un servidor"
 
 #: ../edit-urpm-sources.pl:418
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
-msgstr ""
+msgstr "Introduza o nome do servidor ou o enderezo IP para engadilo:"
 
 #: ../edit-urpm-sources.pl:442
 #, c-format
@@ -319,8 +319,8 @@ msgstr "Límite do soporte"
 msgid "Command"
 msgstr "Comando"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(ningún)"
@@ -407,7 +407,7 @@ msgstr "Actualiza-lo soporte"
 msgid "Regenerate hdlist"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Por favor agarde, actualizando o soporte..."
@@ -505,12 +505,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Soporte engadido con éxito `%s'."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Executando en modo usuario"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -521,568 +521,568 @@ msgstr ""
 "Non poderá facer modificacións no sistema,\n"
 "pero ainda poderá explora-la base de datos existente."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Accesibilidade"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Arquivado"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Copias de Seguridade"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Gravación de CDs"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Compresión"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Outros"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Libros"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Libros de informática"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Faqs"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Comunicacións"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Bases de datos"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Desenvolvemento"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME e GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE e Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Editores"
 
-#: ../rpmdrake:133
-#, fuzzy, c-format
+#: ../rpmdrake:129
+#, c-format
 msgid "Education"
-msgstr "Comunicacións"
+msgstr "Educación"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emuladores"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Utilidades de ficheiro"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Xogos"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Aventura"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Taboleiros"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Cartas"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Puzzles"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Deportes"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Estratexia"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Escritorio gráfico"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "Baseado en FVWM"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Monitorización"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Rede"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Transferencia de ficheiros"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Mensaxería instantánea"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Correo"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Novas"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Acceso Remoto"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Oficina"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Publicación"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Ciencias"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomía"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Bioloxía"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Química"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Informática"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Ciencias da Terra"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matemáticas"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Física"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Son"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sistema"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Configuración"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Arrinque e Inicio"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Empaquetado"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Impresión"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Desenvolvemento"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Desenvolvemento"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Fontes"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Consola"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr ""
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Internacionalización"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel e hardware"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Librerias"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Servidores"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminais"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Utilidades de texto"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Entretementos"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Non dispoñible)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Resultados da busca (ningún)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Agarde, buscando..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Parar"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Actualizable"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, fuzzy, c-format
 msgid "Addable"
 msgstr "Engadible"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Non seleccionado"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Máis información no paquete..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Escolla"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Necesítase un dos seguintes paquetes:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Agarde, facendo a lista dos paquetes..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Sen actualización"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1093,28 +1093,28 @@ msgstr ""
 "actualizacións dispoñibles para os paquetes que ten instalados\n"
 "no seu ordenador, ou que xa as instalou todas."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Todos"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Máis información"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Información nos paquetes"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Cómpre eliminar algúns paquetes adicionais"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1122,12 +1122,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Non se puideron eliminar algúns paquetes"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1136,7 +1136,7 @@ msgstr ""
 "Se se eliminaran estes paquetes o sistema estropearíase, síntoo:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1144,12 +1144,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Paquetes adicionais que cómpre instalar"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1157,17 +1157,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Non se puideron instalar algúns paquetes"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1178,132 +1178,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Cómpre eliminar algúns paquetes"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seleccionado: %d MB / Espacio libre no disco: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Tamaño seleccionado: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
-msgstr ""
+msgstr "A descrición deste paquete non está dispoñible\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Ficheiros:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Soporte: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Versión instalada: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Versión: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Tamaño: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Importancia: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Resumo: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Razón para actualizar: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Descrición: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Actualizacións normais"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr ""
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Tódolos paquetes, por orde alfabética"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Tódolos paquetes, por grupo"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Tódolos paquetes, por tamaño"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, fuzzy, c-format
 msgid "All packages, by selection state"
 msgstr "Tódolos paquetes, por estado da selección"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, fuzzy, c-format
 msgid "All packages, by medium repository"
 msgstr "Tódolos paquetes, por soporte de "
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Tódolos paquetes, por dispoñibilidade da actualización"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
@@ -1333,7 +1338,7 @@ msgstr ""
 msgid "Reload the packages list"
 msgstr "Recarga-la lista de paquetes"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Actualiza-lo soporte"
@@ -1631,7 +1636,7 @@ msgstr "Instalando o paquete `%s' (%s/%s)..."
 #: ../rpmdrake:1407
 #, c-format
 msgid "unable to access rpm file [%s]"
-msgstr ""
+msgstr "non foi posible acceder ó ficheiro rpm [%s]"
 
 #: ../rpmdrake:1442
 #, c-format
@@ -1716,6 +1721,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1729,158 +1739,181 @@ msgstr ""
 "software en CDROM ou DVD. Esta ferramenta axudaralle a escolle-lo\n"
 "software que desexa instalar no seu ordenador."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Eliminación de Paquetes de Software"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Non"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Si"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Información..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Bélxica"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Alemaña"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Dinamarca"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "España"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Francia"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Xapón"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Países Baixos"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "China"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Necesito contactar co sitio web de Mandrakesoft para consegui-la lista de "
+"espellos.\n"
+"Por favor comprobe que a rede está dispoñible.\\ \n"
+"¿Está todo listo para continuar?"
+
+#: ../rpmdrake.pm:408
 #, fuzzy, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1893,7 +1926,14 @@ msgstr ""
 "Por favor comprobe que a rede está dispoñible.\\ \n"
 "¿Está todo listo para continuar?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Por favor agarde, descargando os enderezos dos espellos dende o sitio web de "
+"Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
@@ -1901,12 +1941,27 @@ msgstr ""
 "Por favor agarde, descargando os enderezos dos espellos dende o sitio web de "
 "Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Erro durante a descarga"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Houbo un erro durante a descarga da lista de espellos:\n"
+"\n"
+"%s\n"
+"Pode ser que a rede ou o sitio web de Mandrakesoft non estean dispoñibles.\n"
+"Por favor inténteo de novo máis tarde."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1921,12 +1976,17 @@ msgstr ""
 "Pode ser que a rede ou o sitio web de Mandrakesoft non estean dispoñibles.\n"
 "Por favor inténteo de novo máis tarde."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Non hai espellos"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1941,63 +2001,63 @@ msgstr ""
 "que a arquitectura do seu procesador non estea soportada polas\n"
 "Actualizacións Oficiais de Mandrakelinux."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Por favor escolla o espello que desexe."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Examinando o ficheiro do soporte `%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Examinando o ficheiro remoto do soporte `%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " feito."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " ¡fallou!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s dende o soporte %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Iniciando a descarga de `%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Descarga de `%s', velocidade:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2008,17 +2068,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Seleccione o soporte que quere actualizar:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2027,7 +2087,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2035,17 +2095,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Non foi posible crea-lo soporte."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Fallo ó engadi-lo soporte"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2056,7 +2116,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2322,10 +2390,6 @@ msgstr "Codificación de transferencia descoñecida\n"
 msgid "Unknown error code %d\n"
 msgstr "Código de erro descoñecido %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Instalar Software"
@@ -2337,6 +2401,3 @@ msgstr "Eliminar Software"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Xestor de Soportes de Software"
-
-#~ msgid "Mandrake Update"
-#~ msgstr "Mandrake Update"
diff --git a/po/he.po b/po/he.po
index 18da6620..df426f9e 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: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-09-25 03:14+0200\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <mdk-hebrew@iglu.org.il>\n"
@@ -65,7 +65,7 @@ msgstr "התקן ניתן להסרה"
 msgid "Path or mount point:"
 msgstr "נתיב או נקודת עיגון (mount point):"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "עדכוני אבטחה"
@@ -132,9 +132,9 @@ msgstr "סוג המקור:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "ביטול"
@@ -143,10 +143,10 @@ msgstr "ביטול"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "אישור"
@@ -327,8 +327,8 @@ msgstr "הגבלת מקור"
 msgid "Command"
 msgstr "פקודה"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(כלום)"
@@ -417,7 +417,7 @@ msgstr "עדכון מקורות"
 msgid "Regenerate hdlist"
 msgstr "צור מחדש hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "נא להמתין בעת עדכון המקור..."
@@ -517,12 +517,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "המקור '%s' נוסף בהצלחה."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "רץ במצב משתמש"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -533,568 +533,568 @@ msgstr ""
 "לא יתאפשר לך לבצע שינויים במערכת,\n"
 "אבל כן יתאפשר עיון במסד הנתונים הקיים."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "נגישות"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "כיווץ"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "גיבוי"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "צריבה"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "דחיסה"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "אחר"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "ספרים"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "ספרים על מחשוב"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "שאלות ותשובות"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "מדריכים"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "ספרות"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "אשכול"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "העברת הודעה"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "הכנסת שרותים לתור"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "תקשורת"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "בסיסי נתונים"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "פיתוח"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME ו-GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE ו-QT"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "גרעין"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "עורכים"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "חינוך"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "אמולטורים"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "כלי ניהול קבצים"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "משחקים"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "הרפתקאות"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "משחקי Arcade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "לוחות"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "קלפים"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "תצרף"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "ספורט"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "אסטרטגיה"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "שולחן עבודה גרפי"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "מבוסס FVWM "
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "גרפיקה"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "בקרה"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "מולטימדיה"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "עבודה ברשת"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "צ'אט"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "העברת קובץ..."
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "מסרים מיידים"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "דוא\"ל"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "חדשות"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "גישה מרחוק"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "משרד"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "מפתחות ציבוריים"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "פרסום"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "מדעים"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "אסטרונומיה"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "ביולוגיה"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "כימיה"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "מדעי המחשב"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "מדעי כדוה\"א"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "מתמטיקה"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "פיזיקה"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "מסופים"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "שמע"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "מערכת"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "בסיס"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "הגדרות"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "אתחול"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "חומרה"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "אריזה"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "הדפסה"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "פריסה"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "פריסה"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "גופנים"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "מסוף"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "תמונת X11"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "בנאום"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "חומרה וגרעין"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "ספריות"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "שרתים"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "מסופים"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "כלי עיבוד טקסט"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "צעצועים"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "וידאו"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(לא-זמין)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "תוצאות חיפוש"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "תוצאות חיפוש (כלום)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "נא להמתין בעת החיפוש..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "עצור"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "ניתנות לשדרוג"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "ניתנות להוספה"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "נבחרה"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "לא מסומן"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "עוד מידע על החבילות..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "נא לבחור"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "נדרשת אחת החבילות הבאות:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "נא להמתין בעת הכנת רשימת חבילות..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "לא לעדכן"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1105,28 +1105,28 @@ msgstr ""
 "אין עדכונים זמינים עבור החבילות המותקנות במחשבך,\n"
 "או שכבר התקנת את כל העדכונים."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "הכל"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "עוד מידע "
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "מידע על החבילות"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "יש צורך להסיר מספר חבילות נוספות"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1136,12 +1136,12 @@ msgstr ""
 "יש להסיר את החבילה/ות הבאה/ות בשל התלויות שלהן:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "כמה חבילות לא יכלו להיות מוסרות"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1150,7 +1150,7 @@ msgstr ""
 "הסרת החבילות הבאות, תהרוס לך את המערכת. מצטער: \n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1161,12 +1161,12 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "חבילות נוספות נדרשות"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1177,17 +1177,17 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (שייך לרשימת דילוג)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "מספר חבילות לא ניתנות להתקנה"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1198,132 +1198,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "יש להסיר מספר חבילות"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "גודל נבחר : %d MB /מקום פנוי : %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "גודל נבחר: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "אין תיאור זמין עבור חבילה זו\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "קבצים:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "רשימת שינויים:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "מקור: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "הגרסה המותקנת כרגע: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "שם: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "גרסה: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "גודל : "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "חשיבות : "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "סיכום:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "סיבת העדכון: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "תיאור: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "עדכוני באגים"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "עדכונים רגילים"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "בחירות מנדרייק-לינוקס"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "כל החבילות, עפ\"י סדר האלף-בית"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "כל החבילות, לפי נושא"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "כל החבילות, לפי גודל"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "כל החבילות, לפי מחרוזת החיפוש"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "כל החבילות, לפי מקור תוכנה"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "כל החבילות על פי זמינות עדכון"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "ענפים בלבד, ממוין עפ\"י תאריך התקנה"
@@ -1353,7 +1358,7 @@ msgstr "איפוס הבחירה"
 msgid "Reload the packages list"
 msgstr "טעינה מחדש של רשימת החבילות"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "עדכון מקורות"
@@ -1478,7 +1483,7 @@ msgid "Already existing update media"
 msgstr "כבר קיים מקור לעדכונים"
 
 #: ../rpmdrake:1130
-#, c-format
+#, fuzzy, 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"
@@ -1491,7 +1496,7 @@ msgstr ""
 "מאופשר כרגע. עליך להריץ את מנהל מקורות התוכנה ולאפשר\n"
 "לפחות מקור  אחד (עליך לבדוק את העמודה של אישור )\n"
 "\n"
-"ואז לאתחל את אשף עדכוני התוכנה מחדש."
+"ואז לאתחל את אשף %s מחדש."
 
 #: ../rpmdrake:1140
 #, c-format
@@ -1499,7 +1504,7 @@ msgid "How to choose manually your mirror"
 msgstr "איך לבחור את אתר המראה באופן ידני"
 
 #: ../rpmdrake:1141
-#, c-format
+#, 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"
@@ -1511,7 +1516,7 @@ msgstr ""
 "עליך להפעיל את היישום \"מנהל מקורות תוכנה\", ולהוסיף את\n"
 "מקור התוכנה 'עדכוני אבטחה'.\n"
 "\n"
-"לאחר מכן, יש להריץ מחדש את אשף עדכוני התוכנה."
+"לאחר מכן, יש להריץ מחדש את אשף %s."
 
 #: ../rpmdrake:1170
 #, c-format
@@ -1759,12 +1764,17 @@ msgid ""
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 msgstr ""
-"ברוך בואך לשרות עדכוני התוכנה!\n"
+"ברוך בואך לשרות %s!\n"
 "\n"
 "כלי זה יעזור לך לעדכן את המחשב שלך."
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1778,158 +1788,181 @@ msgstr ""
 "תוכנה בתקליטור(ים) או ברשת. כלי זה יעזור לך לבחור\n"
 "חבילות תוכנה להתקנה במחשב שלך."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "עדכון חבילות תוכנה"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "עדכון Mandrakelinux"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "לא"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "כן"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "מידע..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "אוסטריה"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "אוסטרליה"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "בלגיה"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "ברזיל"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "קנדה"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "קוסטה-ריקה"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "הרפובליקה הצ'כית"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "גרמניה"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "דנמרק"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "יוון"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "ספרד"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "פינלנד"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "צרפת"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "ישראל"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "איטליה"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "יפן"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "קוריאה"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "הולנד"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "נורווגיה"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "פולין"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "פורטוגל"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "רוסיה"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "שוודיה"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "טיוואן"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "בריטניה"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "סין"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "ארה\"ב"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"יש צורך להתחבר לאתר מנדרייק-סופט על מנת לייבא את\n"
+"רשימת אתרי המראה. המחשב צריך להיות מחובר לרשת.\n"
+"\n"
+"האם ניתן להמשיך?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1942,18 +1975,38 @@ msgstr ""
 "\n"
 "האם ניתן להמשיך?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr " נא להמתין בעת הורדת כתובות אתרי מראה מאתר מנדרייק-סופט"
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr " נא להמתין בעת הורדת כתובות אתרי מראה מאתר מנדרייק-סופט"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "שגיאה בזמן הורדה"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"חלה שגיאה בעת הורדת רשימת אתרי המראה:\n"
+"\n"
+"%s\n"
+"יתכן והרשת, או האתר של מנדרייק-סופט אינם זמינים.\n"
+"נא לנסות שוב מאוחר יותר."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1968,12 +2021,17 @@ msgstr ""
 "יתכן והרשת, או האתר של מנדרייק-סופט אינם זמינים.\n"
 "נא לנסות שוב מאוחר יותר."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "אין אתה מראה"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1987,63 +2045,63 @@ msgstr ""
 "ישנן מספר סיבות אפשריות לבעיה זו; הנפוצה בהן היא שארכיטקטורת\n"
 "המעבד הראשי במחשב שלך לא נתמכת על-ידי העדכונים הרשמיים של Mandrakelinux."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "נא לבחור את אתר המראה אליו ברצונך להתחבר."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "העתקת קובץ עבור המקור `%s'.."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "בחינת קובץ ממקור `%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "בחינת קובץ מרוחק במקור `%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " סיום."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " נכשל!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s ממקור %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "מתחיל להוריד את %s..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "הורדה של `%s', זמן נותר:%s, במהירות: %s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "הורדה של `%s' במהירות: %s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "חלה שגיאה בעת ייבוא החבילות"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2058,17 +2116,17 @@ msgstr ""
 "המקורות ולהוסיפו מחדש תוך הגדרתו כהלכה. ייתכן גם שמקור זה אינו\n"
 "זמין כרגע, ובמקרה זה עליך לנסות לעדכן את הרשימה מאוחר יותר."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "נא לבחור את המקורות אותם ברצונך לעדכן:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "עדכון"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2081,7 +2139,7 @@ msgstr ""
 "שגיאות:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2092,17 +2150,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "יצירת המקור נכשלה."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "חלה שגיאה בעת הוספת מקור"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2113,7 +2171,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"המקור `%s', המשמש לעדכוני תוכנה, אינו מתאים לגרסת מנדרייק לינוקס שמותקנת "
+"במערכת זו (%s).\n"
+"ולכן הוא ינוטרל."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2382,10 +2451,6 @@ msgstr "קידוד העברה לא מוכר\n"
 msgid "Unknown error code %d\n"
 msgstr "מספר הודעת השגיאה %d אינו מוכר\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "עדכון Mandrakelinux"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "התקנת תוכנה"
diff --git a/po/hi.po b/po/hi.po
index 60760337..fb7c04fc 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-hi\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-08-22 20:08+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: Hindi, India <dysxhi@yahoo.co.in>\n"
@@ -57,7 +57,7 @@ msgstr "हटाने-योग्य साधन"
 msgid "Path or mount point:"
 msgstr "पथ या आरोह बिन्दू:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "सुरक्षा अपडेटस"
@@ -124,9 +124,9 @@ msgstr "माध्यम का प्रकार:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "निरस्त"
@@ -135,10 +135,10 @@ msgstr "निरस्त"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "ओ०के०"
@@ -320,8 +320,8 @@ msgstr "मीडीया सीमा"
 msgid "Command"
 msgstr "निर्देश"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(कुछ नहीं)"
@@ -410,7 +410,7 @@ msgstr "माध्यम को अपडेट करें"
 msgid "Regenerate hdlist"
 msgstr "हार्डडिस्क सूची का पुनः निर्माण करें"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "कृपया प्रतीक्षा करें, माध्यम अपडेट किया जा रहा है..."
@@ -510,12 +510,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "`%s' माध्यम को सफ़लतापूर्वक जोड़ा गया ।"
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "उपयोगकर्ता विधा में चलायमान"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -526,568 +526,568 @@ msgstr ""
 "आप इस प्रणाली पर परिवर्तनों को नहीं कर पायेगें,\n"
 "पर आप विद्यमान डाटाबेस को फ़िर भी देख सकते है।"
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "प्रवेश-योग्यता"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "पुरालेखण"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "बैक-अप"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "सी०डी० लेखन"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "संकुचन"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "अन्य"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "पुस्तकें"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "कम्पूयटर पुस्तकें"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "बारम्बार पूछे जाने वाले प्रश्न"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "कैसे-करें"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "साहित्य"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "कलस्टर"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "संदेश आगे देना"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "कतार सेवायें"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "संचार"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "अनेक डाटाबेस"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "विस्तार"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "सी०"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "सी०++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "जीनोम और जी०टी०के०+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "जावा"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "के०डी०ई० और क्यू०टी०"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "कर्नल"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "पर्ल"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "पायथन"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "अनेक संपादक"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "शिक्षा"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "प्रतिस्पर्धक (एमयुलेटरस)"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "संचिका टूल्स"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "खेल"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "साहसिक कार्य"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "आरकेड"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "बोर्डस"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "कार्डस"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "पहेलियां"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "खेल-कूद"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "नीति"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "सचित्र डेस्कटाप"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "इनलाइटन-मेन्ट"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "एफ़०वी०डब्लू०एम० पर आधारित"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "गनोम"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "आईसीईडब्लूएम"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "के०डी०ई०"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "साफ़िस"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "विंडोमेकर"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "लेखा-चित्र (ग्राफ़िक्स)"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "निर्देशन"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "मल्टीमीडिया"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "नेटवर्किंग"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "वार्तालाप"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "संचिका स्थानान्तरण"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "त्वरित संदेशवाहन"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "आई०आर०सी०"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "पत्र"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "समाचार"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "सुदूर पहुँच"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "डब्लू०डब्लू०डब्लू०"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "कार्यालय"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "सार्वजनिक कुँजियां"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "प्रकाशन"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "विज्ञान"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "खगोल विज्ञान"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "जीव विज्ञान"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "रसायन विज्ञान"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "कम्पूयटर विज्ञान"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "भू-विज्ञान"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "गणित"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "भौतिक-विज्ञान"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "प्रकोष्ठ (सेल)"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "ध्वनि"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "प्रणाली"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "आधार"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "संरचना"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "बूट और इन्टि"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "हार्डवेयर"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "पैकेजिंग"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "मुद्रण"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "डिप्लोईमेन्ट"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "डिप्लोईमेन्ट"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "फ़ोन्टस"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "कन्सोल"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "वास्तविक प्रकार (ट्रू टाइप)"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "प्रकार१"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 बिट मानचित्र"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "अंतर-राष्ट्रयीकरण "
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "कर्नल और हार्डवेयर"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "अनेक लेखागार"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "अनेक सर्वर"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "एक्सफ़्री-८६"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "टर्मिनल्स"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "टेक्टस टूल्स"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "खिलौने"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "वीडीओ"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(उपलब्ध नहीं है)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "खोज के परिणाम"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "खोज के परिणाम (कुछ नहीं)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "कृपया प्रतीक्षा करें, खोज जारी है..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "आरपीएमड्रैक"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "रूको"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "अपग्रेडेबल"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "जोड़ने-योग्य"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "चयन किया गया"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "चयन नहीं किया गया"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "आरपीएमड्रैक %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "पैकेज पर और ज्यादा सूचना..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "कृपया चयन करें"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "निम्नलिखित में से एक पैकेज की आवश्यकता है:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "कृपया प्रतीक्षा करें, पैकेजों की सूची को दिखाया जा रहा है..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "कोई अपडेट नहीं"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1098,28 +1098,28 @@ msgstr ""
 "अपने कम्पूयटर पर संसाधित किया है, कोई अपडेट उपलब्ध नहीं है या आपने इन सभी\n"
 "को संसाधित कर लिया है।"
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "सभी"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "और सूचना"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "पैकेजों के बारे में सूचना"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "कुछ अतिरिक्त पैकेजों को भी हटाना होगा"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1130,12 +1130,12 @@ msgstr ""
 "हटाना होगा:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "कुछ पैकेजों को हटाया नहीं जा सकता है"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1144,7 +1144,7 @@ msgstr ""
 "क्षमा करें, इन पैकेजों को हटाने से आपकी प्रणाली नष्ट हो जायेगी:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1155,12 +1155,12 @@ msgstr ""
 "अभी अचयनित किया जाना चाहिए:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "अतिरिक्त पैकेजों की आवश्यकता है"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1171,17 +1171,17 @@ msgstr ""
 "को भी संसाधित करना पड़ेगा:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (छोड़ी जाने वाली सूची में सम्मिलित है)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "कुछ पैकेजों को संसाधित नहीं किया जा सका"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1192,132 +1192,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "कुछ पैकेजों को हटाना चाहिए"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "चुना गया:  %d एम०बी० / मुक्त डिस्क स्थान: %d एम०बी०"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "चुना हुआ आकार: %d एम०बी०"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "इस पैकेज हेतु विवरण उपलब्ध नहीं है\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "सचिकाऐं:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "परिवर्तन रोजानामचा:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "माध्यम: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "वर्तमान संसाधित संस्मरण:  "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "नाम: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "संस्मरण: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "आकार: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s के०बी०"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "महत्त्व: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "सारांश: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "अपडेट करने का कारण: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "विवरण: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "दोष-निवारक अपडेटस"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "सामान्य अपडेटस"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "मैनड्रैक की पसन्द"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "सभी पैकेज, वर्णमाला के क्रम में"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "सभी पैकेज, समूहों के क्रम में"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "सभी पैकेज, आकार के क्रम में"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "सभी पैकेज, चयन अवस्था के क्रम में "
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "सभी पैकेज, माध्यम भन्डार के क्रम में"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "सभी पैकेज, अपडेट की उपलब्धता पर आधारित"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "सिर्फ़ लीवस, संसाधन तिथि के क्रम में "
@@ -1347,7 +1352,7 @@ msgstr "चयन को पुनः स्थापित करें"
 msgid "Reload the packages list"
 msgstr "पैकेजों की सूची को पुनः ताजा करें"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "माध्यम को अपडेट करें"
@@ -1487,7 +1492,7 @@ msgstr ""
 "आपको सॉफ़्टवेयर मीडीया प्रबंधक को चलाना चाहिए।\n"
 "(सक्रिय (Enabled?) कालम में देखें)\n"
 "\n"
-"इसके बाद, मैनड्रैक-अपडेट को पुनः आरम्भ करें।"
+"इसके बाद, %s को पुनः आरम्भ करें।"
 
 #: ../rpmdrake:1140
 #, c-format
@@ -1507,7 +1512,7 @@ msgstr ""
 "ऐसा करने के लिए, सॉफ़्टवेयर मीडीया प्रबंधक को आरम्भ करें, और फ़िर\n"
 "एक 'सुरक्षा अपडेटस' माध्यम को जोड़े।\n"
 "\n"
-"इसके बाद, मैनड्रैक-अपडेट को पुनः आरम्भ करें।"
+"इसके बाद, %s को पुनः आरम्भ करें।"
 
 #: ../rpmdrake:1170
 #, c-format
@@ -1756,13 +1761,18 @@ msgid ""
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 msgstr ""
-"मैनड्रैकअपडेट में स्वागत!\n"
+"%s में स्वागत!\n"
 "\n"
 "यह टूल, उन अपडेटस को चयन करने में आपकी मदद करेगा, \n"
 "जिन्हें आप अपने कम्पूयटर पर संसाधित करना चाहते है।"
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1777,158 +1787,181 @@ msgstr ""
 "यह टूल, उन सॉफ़्टवेयरों को चयन करने में आपकी मदद करेगा, \n"
 "जिन्हें आप अपने कम्पूयटर पर संसाधित करना चाहते है।"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "सॉफ़्टवेयर पैकजों का अपडेट"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "मैनड्रैकअपडेट"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "नहीं"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "हाँ"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "सूचना..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "आस्ट्रिया"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "आस्ट्रेलिया"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "बेल्जियम"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "ब्राज़ील"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "कनाडा"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "कोस्टारिका"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "ज़ेक रिपब्लिक"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "जर्मनी"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "डेनमार्क"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "ग्रीस"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "स्पेन"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "फ़िनलैण्ड"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "फ़्रांस"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "इजरायल"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "इटली"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "जापान"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "कोरिया"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "नीदरलैण्ड"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "नार्वे"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "पोलैण्ड"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "पुर्तगाल"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "सोवियत रूस"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "स्वीडन"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "ताईवान"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "ब्रिटेन"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "चीन"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "अमेरिका"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"मुझे मैनड्रैकसॉफ़्ट वेब स्थल से समरूप प्रणालियों की सूची के लिए सम्पर्क करना होगा।\n"
+"कृपया सुनिश्चित करें कि आपका नेटवर्क अभी चलायमान है। \n"
+"\n"
+"क्या अब जारी रख्ना ठीक है?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1941,19 +1974,40 @@ msgstr ""
 "\n"
 "क्या अब जारी रख्ना ठीक है?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"कृपया प्रतीक्षा करें, मैनड्रैकसॉफ़्ट वेब स्थल से समरूप प्रणालियों के पते डॉउनलोड किये जा रहे है। "
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 "कृपया प्रतीक्षा करें, मैनड्रैकसॉफ़्ट वेब स्थल से समरूप प्रणालियों के पते डॉउनलोड किये जा रहे है। "
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "डॉउनलोड के दौरान त्रूटि"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"समरूप प्रणालियों की सूची को डॉउनलोड करने के दौरान एक त्रुटि हुई है:\n"
+"\n"
+"%s\n"
+"नेटवर्क या मैनड्रैकसॉफ़्ट वेब-स्थल हो सकता है कि उपलब्ध नहीं है।\n"
+"कृपया कुछ समय उपरान्त पुनः प्रयास करें।"
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1968,12 +2022,17 @@ msgstr ""
 "नेटवर्क या मैनड्रैकसॉफ़्ट वेब-स्थल हो सकता है कि उपलब्ध नहीं है।\n"
 "कृपया कुछ समय उपरान्त पुनः प्रयास करें।"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "कोई समरूप प्रणाली उपलब्ध नहीं"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1988,63 +2047,63 @@ msgstr ""
 "जब मैनड्रैक लिनक्स अधिकारिक अपडेटस , आपके संसाधक (प्रोसेसर) की संरचना को \n"
 "समर्थित नहीं करते हो।"
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "कृपया इच्छित समरूप प्रणाली का चयन करें।"
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' माध्यम के लिए  संचिका की प्रतिलिपि बनाई जा रही है..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "`%s' माध्यम की संचिका का निरीक्षण हो रहा है..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "`%s' माध्यम की सूदूर संचिका का निरीक्षण किया जा रहा है..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr "किया गया।"
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr "असफ़ल!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s माध्यम से %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "`%s' का डॉउनलोड आरम्भ हो रहा है..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' का डॉउनलोड, समय अनुमान:%s, गति:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' का डॉउनलोड, गति:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "पैकेजों को पुनःप्राप्त करने में त्रुटि"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2061,17 +2120,17 @@ msgstr ""
 "या फ़िर वर्तमान में पहुँच से बाहर है और आपको कुछ समय पश्चात \n"
 "पुनः प्रयास करना चाहिए।"
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "उस माध्यम का चयन करें जिसे आप अपडेट करना चाहते है:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "अपडेट"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2084,7 +2143,7 @@ msgstr ""
 "त्रुटियां:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2095,17 +2154,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "माध्यम का निर्माण करने में असमर्थ।"
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "असफ़लता जब माध्यम को जोड़ा जा रहा था..."
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2116,7 +2175,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"आपका माध्यम `%s', जिसका का उपयोग अपडेटों हेतु किया जा रहा है, मैनड्रैकलिनक्स का संस्मरण, "
+"जिसे आप चला रहे है (%s), के साथ मेल नहीं खा रहा है। \n"
+"इसे निष्क्रिय कर दिया जायेगा ।"
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2385,10 +2455,6 @@ msgstr "अज्ञात स्थानान्तरण कूटलेख�
 msgid "Unknown error code %d\n"
 msgstr "अज्ञात त्रुटि कूट %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "मैनड्रैकअपडेट"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "सॉफ़्टवेयर संसाधन"
diff --git a/po/hr.po b/po/hr.po
index 77959b1c..d66da625 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: Fri Apr 21 2000 17:32:14+0200\n"
 "Last-Translator: Matija Blagus <Matija.Blagus@public.srce.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -59,7 +59,7 @@ msgstr "Uklonjivi medij"
 msgid "Path or mount point:"
 msgstr "Putanja ili točka montiranja: "
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Prikaži sigurnosne nadogradnje"
@@ -126,9 +126,9 @@ msgstr "Tip medija:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
@@ -137,10 +137,10 @@ msgstr "Odustani"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "U Redu"
@@ -320,8 +320,8 @@ msgstr "Limit medija"
 msgid "Command"
 msgstr "Naredba"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(nema)"
@@ -408,7 +408,7 @@ msgstr "Ažuriraj izvore"
 msgid "Regenerate hdlist"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Provjeravam ovisnosti..."
@@ -494,12 +494,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -507,572 +507,572 @@ msgid ""
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Pristupačnost"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Arhiviranje"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Sigurnosno spremanje"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Prženje CD-a"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Kompresija"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Ostali"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Ostali"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Komunikacije"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Baze podataka"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Razvojne nadogradnje"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr ""
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr ""
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Japan"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "Razvojne nadogradnje"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "općenito"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Ažuriraj"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Komunikacije"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Datotečni alati"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Ime"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Avantura"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arkada"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Ploče"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Karte"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Slagalice"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Šport"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategija"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr ""
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr ""
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr ""
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr ""
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "ali ne odgovara"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedija"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Mreža"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Kina"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Prijenos datoteka"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Instant messaging"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Brazil"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Diskusije"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Prenosivi medij"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Ured"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Izdavaštvo"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Znanosti"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomija"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologija"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Kemija"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Računarska tehnika"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geologija"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Ljuske"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Zvuk"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sustav"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr ""
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Podesiti izvor?"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Boot i Init"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Paketiranje"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Upozorenje"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "Razvojne nadogradnje"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Razvojne nadogradnje"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Pisma"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konzola"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "Tip"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Tip"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr ""
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr ""
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr ""
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminali"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Alati za tekst"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Igračke"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Rezultati pretraživanja"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Rezultati pretraživanja"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Molimo pričekajte dok rpm uklanja navedene pakete:"
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Zaustavljanje"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Nadogradi"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr ""
 "Izaberi\n"
 "sve"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, fuzzy, c-format
 msgid "Not selected"
 msgstr " je u konfliktu s %s-%s-%s"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jedan od slijedeih paketa je potreban:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr ""
 "Molimo pričekajte\n"
 "Sortiram pakete"
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Napravi Nadogradnje"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1080,30 +1080,30 @@ msgid ""
 "or you already installed all of them."
 msgstr ""
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Sve"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Izaberite vaše pakete"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr ""
 "Ovi dodatni paketi su potrebni da budu instalirani u pravilu da sve radi "
 "ispravno:"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, fuzzy, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1113,19 +1113,19 @@ msgstr ""
 "U pravilu da zadovoljite sve ovisnosti,\n"
 "slijedeći paketi biti će uklonjeni:"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Nisam u stanju instalirati paket"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1133,12 +1133,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1146,17 +1146,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Nisam u stanju instalirati paket"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, fuzzy, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1164,132 +1164,137 @@ msgid ""
 "%s"
 msgstr "Nisam u stanju instalirati paket"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, fuzzy, c-format
 msgid "Selected size: %d MB"
 msgstr "%d izabranih paketa: %.1f MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Datoteke:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Verzija: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Veličina: %s"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, fuzzy, c-format
 msgid "Importance: "
 msgstr "Značaj: %s\n"
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Sumarno"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Opis:"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Prikaži ispravke grešaka"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Normalne nadogradnje"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "MandrakeDogradnja"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr ""
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Spremi odabir paketa"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr ""
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
@@ -1319,7 +1324,7 @@ msgstr ""
 msgid "Reload the packages list"
 msgstr "Izabir instaliranih paketa"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Ažuriraj izvore"
@@ -1684,6 +1689,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1692,158 +1702,177 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr " Upravitelj programima "
+
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Mandrakelinux Update"
+msgstr "%s postavke"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Da"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australija"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Češka Republika"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Njemačka"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grčka"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Španjolska"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Pronađi:"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Prisili"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Instaliraj"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Instaliraj"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Prisili"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Nizozemska"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Port:"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Ruska"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Švedska"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Tajland"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Ujedinjeno Kraljevstvo"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Sjedinjene Američke Države"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1852,18 +1881,33 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Provjeravam ovisnosti..."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1873,12 +1917,17 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "mirror:"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1888,65 +1937,65 @@ msgid ""
 "by Mandrakelinux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr ""
 "Molimo pričekajte\n"
 "Dohvaćam listu mirror-a"
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr "Lokalno"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -1957,19 +2006,19 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr ""
 "Molim odaberite izvore\n"
 "koje želite dograditi:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Nadogradi"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -1978,7 +2027,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -1986,17 +2035,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, fuzzy, c-format
 msgid "Unable to create medium."
 msgstr "Ne mogu napraviti report datoteku, prekidam.\n"
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Provjeravam ovisnosti..."
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2004,7 +2053,15 @@ msgid ""
 "%s"
 msgstr "Pripremam se za instalaciju"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2272,11 +2329,6 @@ msgstr ""
 msgid "Unknown error code %d\n"
 msgstr "Nepoznati kod greške %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-#, fuzzy
-msgid "Mandrakelinux Update"
-msgstr "%s postavke"
-
 #
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
diff --git a/po/hu.po b/po/hu.po
index a1108d3c..420a5601 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-hu\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-08-18 14:44+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -61,7 +61,7 @@ msgstr "Cserélhető eszköz"
 msgid "Path or mount point:"
 msgstr "Útvonal vagy csatolási pont:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Biztonsági frissítések"
@@ -129,9 +129,9 @@ msgstr "Az adatforrás típusa:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Mégsem"
@@ -140,10 +140,10 @@ msgstr "Mégsem"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -325,8 +325,8 @@ msgstr "Adatforrás-korlát"
 msgid "Command"
 msgstr "Parancs"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(egyik sem)"
@@ -415,7 +415,7 @@ msgstr "Adatforrás frissítése"
 msgid "Regenerate hdlist"
 msgstr "Fejléclista frissítése"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Az adatforrások frissítése folyamatban..."
@@ -518,12 +518,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "A(z) '%s' adatforrás felvétele megtörtént."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Futtatás felhasználói üzemmódban"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -534,517 +534,517 @@ msgstr ""
 "Módosításokat nem fog tudni végrehajtani a rendszeren,\n"
 "viszont böngészheti a meglevő adatbázist."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Segédeszközök fogyatékosoknak"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Archiválás"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Biztonsági mentés"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "CD-írás"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Tömörítőprogramok"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Egyéb"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Könyvek"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Számítástechnikai könyvek"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Gy.I.K. (FAQ) dokumentumok"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "HOGYAN-ok"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Irodalom"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Fürt"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "Üzenetátadás"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "Sorszolgáltatások"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Kommunikáció"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Adatbázisok"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Fejlesztés"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME és GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE és Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Szövegszerkesztők"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Oktatás"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulátorok"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Fájlkezelő eszközök"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Játékok"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Kalandjátékok"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Ügyességi játékok"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Táblás játékok"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kártyajátékok"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Logikai játékok"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sportjátékok"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Stratégia"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Grafikus környezet"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM-alapú"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "IceWM"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Monitorozás"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimédia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Hálózat"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Csevegés"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Fájlátvitel"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Azonnali üzenetküldő program"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Levelezőprogramok"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Hírek"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Távoli elérés"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Irodai alkalmazások"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Nyilvános kulcsok"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Publikálás"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Tudományok"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Csillagászat"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biológia"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Kémia"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Számítástechnika"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Földrajz"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Parancsértelmezők"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Hang"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Rendszer"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Alap"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Beállítás"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Indítás és inicializálás"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Hardver"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Csomagoló"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Nyomtatás"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "Telepítés"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Telepítés"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Betűtípusok"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konzol"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "TrueType"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bittérkép"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Honosítás"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel és hardver"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Könyvtárak"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Kiszolgálók"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminálok"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Szövegkezelő eszközök"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Mütyürkék"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Videó"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Nem elérhető)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Keresési eredmény"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Keresési eredmény (nincs)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Keresés..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Leállítás"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Frissíthető"
@@ -1053,53 +1053,53 @@ msgstr "Frissíthető"
 # "by update availability"; the first lists the packages you can "add" to your computer
 # (new packages), the second lists the packages which are newer versions of already
 # installed packages
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Telepíthető"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Kijelölve"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Nincs kijelölve"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "További információ a csomagról..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Válasszon"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Szükség van a következő csomagok valamelyikére:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "A csomagok listázása folyamatban..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Frissítés nem található"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1110,28 +1110,28 @@ msgstr ""
 "gépére telepített csomagokhoz frissítés, vagy pedig már telepítve\n"
 "lett az összes."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Mind"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "További információ"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Információ a csomagokról"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Néhány további csomagot is el kell távolítani"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1141,12 +1141,12 @@ msgstr ""
 "A függőségeik miatt a következő csomago(ka)t is el kell távolítani:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Bizonyos csomagok nem távolíthatók el"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1155,7 +1155,7 @@ msgstr ""
 "Ezen csomagok eltávolítása rendszerproblémákhoz vezetne:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1165,12 +1165,12 @@ msgstr ""
 "A függőségeik miatt a következő csomag(ok) kijelölését törölni kell:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Szükség van további csomagokra"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1180,17 +1180,17 @@ msgstr ""
 "A függőségek miatt a következő csomago(ka)t is telepíteni kell:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (a kihagyandók listájához tartozik)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Bizonyos csomagok nem telepíthetők"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1201,137 +1201,142 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Bizonyos csomagokat el kell távolítani"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Kijelölve: %d MB / Üres hely a lemezen: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Kijelölve: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Ehhez a csomaghoz nincs leírás\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Fájlok:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Változások jegyzéke:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Adatforrás: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "A jelenleg telepített verzió: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Név: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Verzió: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Méret: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KByte"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Fontosság: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Összefoglaló: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "A frissítés oka: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Leírás: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Hibajavító frissítések"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Normál frissítések"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux-válogatás"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Az összes csomag, ábécérendben"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Az összes csomag, csoport szerint"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Az összes csomag, méret szerint"
 
 # it's a sort method
 # "selected or not"
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Az összes csomag, kijelölési állapot szerint"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Az összes csomag, adatforrás alapján"
 
 # it's a sort method
 # "new or update"
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Az összes csomag, frissítés elérhetősége alapján"
 
 # urpmi_rpm-find-leaves: returns the packages not required by any other package
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "A más által nem igényeltek, telepítési dátum szerint"
@@ -1361,7 +1366,7 @@ msgstr "A kijelölés visszaállítása"
 msgid "Reload the packages list"
 msgstr "A csomaglista újraolvasása"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Adatforrások frissítése"
@@ -1777,6 +1782,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1790,158 +1800,181 @@ msgstr ""
 "szoftvercsomagot tartalmaz. Ezzel a programmal kiválaszthatja,\n"
 "mely szoftvercsomagokat kívánja telepíteni a gépére."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Szoftvercsomag-frissítés"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux-frissítés"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Nem"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Igen"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Információ..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Ausztria"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Ausztrália"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgium"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brazília"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Cseh Köztársaság"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Németország"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Dánia"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Görögország"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Spanyolország"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finnország"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Franciaország"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Olaszország"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japán"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Hollandia"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norvégia"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Lengyelország"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugália"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Oroszország"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Svédország"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Egyesült Királyság"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Kína"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Amerikai Egyesült Államok"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"A tükörkiszolgálók listájának letöltéséhez most kapcsolódni kell\n"
+"a Mandrakesoft weboldalához. Ellenőrizze, hogy a hálózat elérhető-e.\n"
+"\n"
+"Kívánja folytatni?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1954,18 +1987,38 @@ msgstr ""
 "\n"
 "Kívánja folytatni?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "A tükörkiszolgálók listájának letöltése a Mandrakesoft weboldaláról..."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "A tükörkiszolgálók listájának letöltése a Mandrakesoft weboldaláról..."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Hiba a letöltés közben"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Hiba történt a tükörkiszolgálók listájának letöltése közben:\n"
+"\n"
+"%s\n"
+"Elképzelhető, hogy a hálózat vagy a Mandrakesoft-weboldal nem\n"
+"elérhető. Próbálja meg később."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1980,12 +2033,17 @@ msgstr ""
 "Elképzelhető, hogy a hálózat vagy a Mandrakesoft-weboldal nem\n"
 "elérhető. Próbálja meg később."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Tükörkiszolgáló nem található"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2000,64 +2058,64 @@ msgstr ""
 "a hivatalos Mandrakelinux-frissítések nem támogatják az Ön\n"
 "gépében levő processzort."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Válassza ki a kívánt tükörkiszolgálót."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Az adatforráshoz tartozó fájl másolása: \"%s\"..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Az adatforráshoz tartozó fájl vizsgálata: \"%s\"..."
 
 # $label->set_label(N("Examining remote file of medium `%s'...", $file));
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Az adatforráshoz tartozó távoli fájl vizsgálata: \"%s\"..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " kész"
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " nem sikerült"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s a következő adatforrásból: %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "\"%s\" letöltésének megkezdése..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "\"%s\" letöltése; hátralevő idő: %s; sebesség: %s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "\"%s\" letöltése; sebesség: %s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Hiba a csomagok letöltése közben"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2073,17 +2131,17 @@ msgstr ""
 "újrakonfigurálás érdekében; vagy pedig nem elérhető - ebben az esetben\n"
 "pedig próbálkozzon később."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Válassza ki, mely adatforrás(oka)t kívánja frissíteni:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Frissítés"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2096,7 +2154,7 @@ msgstr ""
 "Hibák:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2107,17 +2165,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Az adatforrás létrehozása nem sikerült."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Nem sikerült felvenni az adatforrást"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2128,7 +2186,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"A(z) \"%s\" frissítési adatforrás nem felel meg a jelenleg használt "
+"Mandrakelinux verziójának (%s).\n"
+"Az adatforrás ki lesz kapcsolva."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2397,10 +2466,6 @@ msgstr "Ismeretlen átviteli kódolás\n"
 msgid "Unknown error code %d\n"
 msgstr "Ismeretlen hibakód: %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux-frissítés"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Szoftvertelepítés"
diff --git a/po/id.po b/po/id.po
index 6a4b790a..e6734c2c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2003-08-13 15:16+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Bahasa Indonesia <id@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Perangkat portabel"
 msgid "Path or mount point:"
 msgstr "Path atau titik mount:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Update sekuriti"
@@ -125,9 +125,9 @@ msgstr "Jenis media:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
@@ -136,10 +136,10 @@ msgstr "Batal"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -319,8 +319,8 @@ msgstr "Batasan media"
 msgid "Command"
 msgstr "Perintah"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(tiada)"
@@ -407,7 +407,7 @@ msgstr "Update media"
 msgid "Regenerate hdlist"
 msgstr "Buat ulang hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Media sedang di-update..."
@@ -502,12 +502,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Jalankan dalam modus pengguna"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -518,568 +518,568 @@ msgstr ""
 "Anda tak dapat memodifikasi sistem, tapi tetap dapat\n"
 "menjelajah database."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Kemudahan akses"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Pengarsipan"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Bakar CD"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Kompresi"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Lainnya"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Buku"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Buku komputer"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "FAQ"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howto"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Literatur"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Komunikasi"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Database"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Pengembangan"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME dan GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE dan Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Editor"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Komunikasi"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulator"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Perkakas file"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Game"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Petualangan"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Papan"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kartu"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Teka-teki"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Olahraga"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategi"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Desktop grafis"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "basis FVWM"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafik"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Pemantauan"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Kerja Jaringan"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Transfer file"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Pesan instan"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Surat"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Akses remote"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Kantor"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Penerbitan"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Ilmu pengetahuan"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomi"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologi"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Kimia"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Ilmu komputer"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geosains"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fisika"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Cangkang"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Suara"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sistem"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Basis"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurasi"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Boot dan Inisiasi"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Piranti keras"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Pemaketan"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Pencetakan"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Pengembangan"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Pengembangan"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Font"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konsol"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Internasionalisasi"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel dan hardware"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Pustaka"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Server"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminal"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Perkakas teks"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Mainan"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Tak tersedia)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Hasil pencarian"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Hasil pencarian (tak ada)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Tunggu, sedang dicari..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Stop"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Dapat di-upgrade"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Dapat ditambahkan"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Terpilih"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Tak dipilih"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, fuzzy, c-format
 msgid "Rpmdrake %s"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Info tambahan paket..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Pilihlah"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Satu di antara paket berikut diperlukan:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Tunggu, paket sedang didaftar..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Tiada update"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1089,28 +1089,28 @@ msgstr ""
 "Daftar update kosong. Artinya tidak ada update untuk paket yang\n"
 "terinstal di komputer Anda, atau Anda sudah menginstalnya."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Semua"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Info lain"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Informasi paket"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Beberapa paket tambahan perlu dihapus"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1118,12 +1118,12 @@ msgid ""
 "\n"
 msgstr "Untuk memenuhi dependensi, paket-paket berikut perlu dihapus:\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Beberapa paket tak dapat dihapus"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1132,7 +1132,7 @@ msgstr ""
 "Maaf, menghapus paket ini berarti merusak sistem Anda:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1142,12 +1142,12 @@ msgstr ""
 "Karena aspek ketergantungan, paket berikut harus tak dipilih:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Dibutuhkan paket tambahan"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1155,17 +1155,17 @@ msgid ""
 "\n"
 msgstr "Untuk memenuhi ketergantungan, paket berikut juga harus diinstal:\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Beberapa paket tak dapat diinstal"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1176,132 +1176,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Beberapa paket perlu dihapus"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Terpilih: %d MB / Tersedia: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Terpilih: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "File:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Media: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Versi terinstal: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Nama: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Versi: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Ukuran: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Derajat Kepentingan: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Ringkasan: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Alasan update: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Gambaran: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Update bugfix"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Update normal"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Pilihan Mandrakelinux"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Semua paket, menurut abjad"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Semua paket, menurut grup"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Semua paket, menurut ukuran"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Semua paket, menurut status pilihan"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Semua paket, menurut repositori media"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Semua paket, menurut kesediaan update"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Daun saja, berurut tanggal instalasi"
@@ -1331,7 +1336,7 @@ msgstr "Reset pilihan"
 msgid "Reload the packages list"
 msgstr "Muat ulang daftar paket"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Media update"
@@ -1748,6 +1753,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1761,158 +1771,181 @@ msgstr ""
 "CDROM atau DVD. Perkakas ini akan membantu Anda memilih piranti lunak yang\n"
 "hendak diinstal di komputer Anda."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Penghapusan Paket Software"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Tidak"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Ya"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Republik Ceko"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Jerman"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Denmark"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Yunani"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Spanyol"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Perancis"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Palestina"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Itali"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Jepang"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Belanda"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norwegia"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Polandia"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Swedia"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Inggris"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Cina"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Amerika Serikat"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Website Mandrakesoft harus dihubungi untuk mendapatkan daftar mirror.\n"
+"Pastikan bahwa jaringan Anda berjalan baik.\n"
+"\n"
+"Jalan terus?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1925,18 +1958,38 @@ msgstr ""
 "\n"
 "Jalan terus?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Tunggu, alamat mirror sedang diambil dari website Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Tunggu, alamat mirror sedang diambil dari website Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Error saat download"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Error saat pengambilan daftar mirror:\n"
+"\n"
+"%s\n"
+"Jaringan, atau website Mandrakesoft mungkin tak dapat dipakai.\n"
+"Cobalah lagi nanti."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1951,12 +2004,17 @@ msgstr ""
 "Jaringan, atau website Mandrakesoft mungkin tak dapat dipakai.\n"
 "Cobalah lagi nanti."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Tiada mirror"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1970,63 +2028,63 @@ msgstr ""
 "Sebabnya mungkin banyak; yang paling sering yaitu jika arsitektur\n"
 "prosesor Anda tak ditunjang oleh Update Resmi Mandrakelinux."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Pilihlah mirror yg diinginkan."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Salin file utk media `%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Periksa file media `%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Periksa file remote media `%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " selesai."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " gagal!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Download `%s' dimulai..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download `%s', waktu yg dibutuhkan:%s, kecepatan:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download `%s', kecepatan:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2037,17 +2095,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Pilih media yg ingin di-update:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Update"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2060,7 +2118,7 @@ msgstr ""
 "Error:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2068,17 +2126,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Gagal membuat media."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "Media sedang ditambahkan..."
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2089,7 +2147,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2355,10 +2421,6 @@ msgstr "Pengkodean transfer tak dikenal\n"
 msgid "Unknown error code %d\n"
 msgstr "Kode error tak dikenal %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Instal Software"
diff --git a/po/is.po b/po/is.po
index ebb17bdd..b535314c 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-03-02 23:40+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <isl@molar.is>\n"
@@ -56,7 +56,7 @@ msgstr "Aftengjanlegt tæki"
 msgid "Path or mount point:"
 msgstr "Slóð eða tengipunktur"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Öryggisuppfærslur"
@@ -123,9 +123,9 @@ msgstr "Tegund miðils:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Hætta við"
@@ -134,10 +134,10 @@ msgstr "Hætta við"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Í lagi"
@@ -320,8 +320,8 @@ msgstr ""
 msgid "Command"
 msgstr "Skipun"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(ekkert)"
@@ -410,7 +410,7 @@ msgstr "Uppfæra miðil"
 msgid "Regenerate hdlist"
 msgstr "Endurbyggja hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Augnablik, uppfæri miðil..."
@@ -501,12 +501,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -514,568 +514,568 @@ msgid ""
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Aðgengi"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Þjöppun"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Afrit"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Geisladiskaskrif"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Þjöppun"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Annað"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Bækur"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Tölvubækur"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "SOS"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Bókmenntir"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Samskipti"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Databases"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Forritunartól"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME og GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE og Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kjarni"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Ritlar"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Samskipti"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Hermar"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Skráartól"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Leikir"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Ævintýri"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Spilasalur"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Borð"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Spjöld"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Pússlur"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Íþróttir"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Herkænska"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Grafískt skjáborð"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM grunnur"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Myndvinnsla"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Eftirlit"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Margmiðlun"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Netforrit"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Spjall"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Skráaflutningur"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Samtalsbiðill (Instant Messenger)"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Póstur"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Fréttir"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Fjarvinnsla"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Skrifstofuforrit"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Umbrot"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Vísindi"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Stjörnufræði"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Líffræði"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Efnafræði"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Tölvufræði"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Jarðfræði"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Stærðfræði"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Eðlisfræði"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Skeljar"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Hljóð"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Kerfi"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Grunnur"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Stillingar"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Boot og Init"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Vélbúnaður"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Pakkastjórn"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Prentun"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Forritunartól"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Forritunartól"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Letur"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Skjától"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Tegund 1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitamynd"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Tungumál"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kjarni og vélbúnaður"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Undirforritasöfn"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Þjónar"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Skjáhermar"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Textatól"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Leikföng"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Myndmerki"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Leitarniðurstöður"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Leitarniðurstöður (engar)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Augnablik, leita..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Stöðva"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Uppfæranlegt"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Viðbætanlegt"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Valið"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Ekki valið"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Ítarlegri upplýsingar um pakka..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Vinsamlega veldu"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Augnablik, útbý pakkalista..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr ""
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1083,28 +1083,28 @@ msgid ""
 "or you already installed all of them."
 msgstr ""
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Allt"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Nánari upplýs."
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Upplýsingar um pakka"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Það þarf að fjarlægja aðra pakka"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1112,19 +1112,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Ekki er hægt að fjarlægja suma pakkana"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1132,12 +1132,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1147,17 +1147,17 @@ msgstr ""
 "Til að uppfylla kröfur þarf einnig að setja inn eftirfarandi pakka\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Ekki er hægt að setja inn suma pakkana"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1168,132 +1168,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Suma pakka þarf að fjarlægja"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valið: %d MB / Laust diskpláss: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Valin stærð %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Skrár:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Breytingasaga:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Miðill: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Nafn: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Útgáfa: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Stærð: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Mikilvægi: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Yfirlit: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Ástæður fyrir uppfærslu: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Lýsing: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr ""
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Alla pakka, eftir flokkum"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Allir pakkar, eftir stærð"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr ""
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Allir pakkar, eftir miðli"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Allir pakkar, sem hægt er að uppfæra"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
@@ -1323,7 +1328,7 @@ msgstr ""
 msgid "Reload the packages list"
 msgstr "Endurlesa pakkalista"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Uppfæra miðil"
@@ -1702,6 +1707,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1710,158 +1720,181 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Fjarlægja uppsetta pakka"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Uppfærsla"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Nei"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Já"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Upplýsingar..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Austurríki"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Ástralía"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgía"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasilía"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Kosta Ríka"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Tékkland"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Þýskaland"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grikkland"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Spánn"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finnland"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Frakkland"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Ísrael"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Ítalía"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Kórea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Noregur"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Pólland"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portúgal"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Rússland"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Svíþjóð"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Tævan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Stóra Bretland"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Kína"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Bandaríkin"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Ég þarf að tengjast spegil-miðlara til að fá nýjustu upplýsingar um pakka\n"
+"Vinsamlega athugaðu hvort netsamband sé ekki uppi.\n"
+"\n"
+"Er í lagi að halda áfram?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1870,18 +1903,33 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Augna blik, sæki upplýsingar um spegla frá Mandrakesoft vefnum."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Augna blik, sæki upplýsingar um spegla frá Mandrakesoft vefnum."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Villa við að sækja pakka"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1891,12 +1939,17 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Enginn spegill"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1906,63 +1959,63 @@ msgid ""
 "by Mandrakelinux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Vinsamlega veldu æskilegan spegil."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Afrita skrár fyrir miðil `%s'..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Athuga skrá á miðli `%s'..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Athuga fjarlæga skrá fyrir miðil `%s'..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " mistókst!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Byrja niðurhal á `%s'..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -1973,17 +2026,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Veldu miðil sem þú vilt uppfæra:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Uppfæra"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -1996,7 +2049,7 @@ msgstr ""
 "Villur:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2004,17 +2057,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Gat ekki búið til miðil."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Villa þegar miðli var bætt við"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2025,7 +2078,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2291,10 +2352,6 @@ msgstr "Óþekkt flutningskóðun\n"
 msgid "Unknown error code %d\n"
 msgstr "Óþekktur villukóði %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Uppfærsla"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Setja inn hugbúnað"
diff --git a/po/it.po b/po/it.po
index c0fa8999..3876ff19 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-it\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-03-02 00:03+0100\n"
 "Last-Translator: Ruggero Tonelli <ruggero@valtellinux.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -69,7 +69,7 @@ msgstr "Dispositivo rimovibile"
 msgid "Path or mount point:"
 msgstr "Percorso o punto di mount:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Aggiornamenti per la sicurezza"
@@ -136,9 +136,9 @@ msgstr "Tipo di supporto:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Annulla"
@@ -147,10 +147,10 @@ msgstr "Annulla"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -334,8 +334,8 @@ msgstr "Limite supporti"
 msgid "Command"
 msgstr "Comando"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(nessuna)"
@@ -424,7 +424,7 @@ msgstr "Aggiorna supporti"
 msgid "Regenerate hdlist"
 msgstr "Rigenera hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Attendere, aggiornamento dei supporti in corso..."
@@ -527,12 +527,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Supporto `%s' aggiunto con sucesso."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "In esecuzione in modo utente"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -543,568 +543,568 @@ msgstr ""
 "Non potrai apportare modifiche al sistema, ma\n"
 "potrai comunque sfogliare il database esistente."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Accessibilità"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Archiviazione"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Masterizzazione"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Compressione"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Altro"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Libri"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Libri d'informatica"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "FAQ"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howto"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Letteratura"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Comunicazioni"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Database"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Sviluppo"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME e GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE e QT"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Editor"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Comunicazioni"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Gestione file"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Giochi"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Avventure"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Schede"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Schede"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Rompicapo"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategia"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Desktop grafico"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "Basato su FVWM"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafica"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Monitoraggio"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Rete"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Trasferimento file"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Messaggi istantanei"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Posta"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Accesso remoto"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Ufficio"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Editoria"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Scienze"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomia"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologia"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Chimica"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Informatica"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Scienze della terra"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematica"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fisica"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Suono"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sistema"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Boot e init"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Pacchetti"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Stampa in corso"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Sviluppo"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Sviluppo"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Font"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Console"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "Bitmap X11"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Localizzazione"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel e hardware"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Librerie"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Server"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminali"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Strumenti per testi"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Giochi"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Non disponibile)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Risultati della ricerca"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Risultati della ricerca (nessuno)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Attendere, ricerca in corso..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Stop"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Aggiornabili"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Aggiungibili"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Selezionato"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Non selezionato"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Ulteriori informazioni sul pacchetto..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Seleziona"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "È necessario uno dei seguenti pacchetti:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Attendere, è in corso la creazione dell'elenco dei pacchetti..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Nessun aggiornamento"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1115,28 +1115,28 @@ msgstr ""
 "non sono disponibili aggiornamenti per i pacchetti installati sul\n"
 "tuo computer, oppure li hai già installati tutti."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Tutti"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Maggiori informazioni"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Informazioni sui pacchetti"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Devono essere rimossi altri pacchetti"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1147,12 +1147,12 @@ msgstr ""
 "anche i seguenti pacchetti:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Alcuni pacchetti non possono essere rimossi"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1161,7 +1161,7 @@ msgstr ""
 "Spiacente, la rimozione di questi pacchetti danneggerebbe il tuo sistema:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1172,12 +1172,12 @@ msgstr ""
 "deselezionati i seguenti pacchetti:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Sono necessari altri pacchetti"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1188,17 +1188,17 @@ msgstr ""
 "installati anche i seguenti pacchetti:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Alcuni pacchetti non possono essere installati"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1209,132 +1209,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Alcuni pacchetti devono essere rimossi"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Selezionati: %d MB / Spazio libero su disco: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Dimensione pacchetti selezionati: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "File:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Registro delle modifiche:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Supporto: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Versione attualmente installata: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Versione: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Dimensioni: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s kB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Importanza: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Riassunto: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Motivo dell'aggiornamento: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Descrizione: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Aggiornamenti correttivi"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Aggiornamenti normali"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Scelte di Mandrakelinux"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Tutti i pacchetti, in ordine alfabetico"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Tutti i pacchetti, per gruppo"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Tutti i pacchetti, per dimensione"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Tutti i pacchetti, per stato di selezione"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Tutti i pacchetti, per supporto"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Tutti i pacchetti, per disponibilità di aggiornamenti"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Solo foglie, per data di installazione"
@@ -1364,7 +1369,7 @@ msgstr "Annulla la selezione"
 msgid "Reload the packages list"
 msgstr "Ricarica la lista dei pacchetti"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Aggiorna supporti"
@@ -1781,6 +1786,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1794,158 +1804,182 @@ msgstr ""
 "software su CD-ROM o DVD. Questo programma ti aiuterà a scegliere il\n"
 "software da installare sul tuo computer."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Rimozione Pacchetti Software"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "No"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Sì"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Informazioni..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Belgio"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brasile"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Repubblica Ceca"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Germania"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Danimarca"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Spagna"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Francia"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Israele"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Giappone"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Paesi Bassi"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norvegia"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portogallo"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Russia"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Svezia"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Regno Unito"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Cina"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Stati Uniti"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"È necessario contattare il sito web di Mandrakesoft per prelevare l'elenco "
+"dei mirror.\n"
+"Verifica che la rete sia in funzione.\n"
+"\n"
+"Vuoi proseguire?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1959,7 +1993,14 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Attendere, è in corso il download degli indirizzi dei mirror dal sito di "
+"Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
@@ -1967,12 +2008,27 @@ msgstr ""
 "Attendere, è in corso il download degli indirizzi dei mirror dal sito di "
 "Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Errore durante il download"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Si è verificato un errore durante lo scaricamento della lista dei mirror:\n"
+"\n"
+"%s\n"
+"Probabilmente la rete o il sito web di Mandrakesoft non\n"
+"sono disponibili. Riprova più tardi."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1987,12 +2043,17 @@ msgstr ""
 "Probabilmente la rete o il sito web di Mandrakesoft non\n"
 "sono disponibili. Riprova più tardi."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Nessun mirror"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2007,63 +2068,63 @@ msgstr ""
 "la possibilità che l'architettura del tuo processore non sia\n"
 "supportata dagli aggiornamenti ufficiali di Mandrakelinux."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Scegli il mirror che preferisci."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copio i file per il supporto \"%s\"..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Esamino i file del supporto \"%s\"..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Esamino il file remoto del supporto \"%s\"..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " fatto."
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " fallita!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s dal supporto %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Inizio del download di \"%s\"..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download di %s, tempo rimasto: %s, velocità: %s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download di \"%s\", velocità: %s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2074,17 +2135,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Seleziona i supporti che vuoi aggiornare:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Aggiorna"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2097,7 +2158,7 @@ msgstr ""
 "Errori:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2108,17 +2169,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Impossibile creare il supporto."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Errore nell'aggiunta del supporto"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2129,7 +2190,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2395,10 +2464,6 @@ msgstr "Codifica del trasferimento non riconosciuta\n"
 msgid "Unknown error code %d\n"
 msgstr "Codice di errore sconosciuto: %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Installa software"
diff --git a/po/ja.po b/po/ja.po
index ef8bc68b..cdc11845 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-ja\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-09-02 22:46+0900\n"
 "Last-Translator: BANDO Yukiko <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -61,7 +61,7 @@ msgstr "リムーバブルデバイス"
 msgid "Path or mount point:"
 msgstr "パスまたはマウントポイント:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "セキュリティアップデート"
@@ -128,9 +128,9 @@ msgstr "メディアの種類:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
@@ -139,10 +139,10 @@ msgstr "キャンセル"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -323,8 +323,8 @@ msgstr "メディアの制限"
 msgid "Command"
 msgstr "コマンド"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(なし)"
@@ -413,7 +413,7 @@ msgstr "メディアを更新"
 msgid "Regenerate hdlist"
 msgstr "hdlistを再生成"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "お待ちください。メディアを更新中です。"
@@ -514,12 +514,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "メディア '%s' の追加に成功しました"
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "ユーザモードで実行"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -530,568 +530,568 @@ msgstr ""
 "システムを変更することはできません。\n"
 "データベースを閲覧することはできます。"
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "アクセス"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "書庫作成"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "バックアップ"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "CD作成"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "圧縮"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "その他"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "書籍"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "コンピュータ書籍"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "FAQ"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "HowTo"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "文学"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "クラスタ"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "メッセージ転送"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "キューイングサービス"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "コミュニケーション"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "データベース"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "開発"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOMEとGTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDEとQt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "カーネル"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "エディタ"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "教育"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "エミュレータ"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "ファイルツール"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "ゲーム"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "アドベンチャー"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "アーケード"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "ボード"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "トランプ"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "パズル"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "スポーツ"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "戦略"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "グラフィカルデスクトップ"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM系"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "グラフィック"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "モニタリング"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "マルチメディア"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "ネットワーク"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "チャット"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "ファイル転送"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "インスタントメッセージ"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "メール"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "ニュース"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "リモートアクセス"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "オフィス"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "パブリックキー"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "出版"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "科学"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "天文学"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "生物学"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "化学"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "コンピュータサイエンス"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "地球科学"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "数学"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "物理学"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "シェル"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "サウンド"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "システム"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "ベース"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "設定"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "起動とInit"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "ハードウェア"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "パッケージング"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "印刷"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "開発"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "開発"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "フォント"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "コンソール"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11ビットマップ"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "国際化"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "カーネルとハードウェア"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "ライブラリ"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "サーバ"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "ターミナル"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "テキストツール"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "おもちゃ"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "動画"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(なし)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "検索結果"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "検索結果(なし)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "ファイルを検索中です。お待ちください。"
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "中止"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "更新可能"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "追加可能"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "選択済み"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "選択していません"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "パッケージの詳細情報"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "選んでください"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "以下のパッケージのどれかが必要です:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "RPMを並べかえています。お待ちください。"
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "更新なし"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1101,28 +1101,28 @@ msgstr ""
 "更新リストが無効です。インストールしているパッケージの\n"
 "更新版がないか、それら全てを既にインストールしています。"
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "全て"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "詳細情報"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "パッケージの情報"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "いくつかのパッケージを削除します"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1133,12 +1133,12 @@ msgstr ""
 "以下のパッケージを削除します:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "削除できないパッケージがあります"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1147,7 +1147,7 @@ msgstr ""
 "このパッケージを削除するとシステムが壊れます:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1158,12 +1158,12 @@ msgstr ""
 "以下のパッケージを選択から外します:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "追加パッケージが必要です"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1174,17 +1174,17 @@ msgstr ""
 "以下のパッケージを追加します:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (スキップリストに含まれています)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "インストールできないパッケージがあります"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1195,132 +1195,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "いくつかのパッケージを削除します"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "選択: %d MB / ディスクの空き容量: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "選択サイズ: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "このパッケージには説明がありません\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "ファイル: \n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "変更ログ: \n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "メディア: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "現在のバージョン: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "名前: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "バージョン: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "サイズ: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "重要性: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "概要: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "更新の理由: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "説明: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "バグ修正の更新"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "通常の更新"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux式の分類"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "全パッケージ(ABC順)"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "全パッケージ, グループ順"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "全パッケージ, サイズ順"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "全パッケージ, 選択順"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "全パッケージ, メディア順"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "全パッケージ, 更新可能順"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "削除専用, インストール順"
@@ -1350,7 +1355,7 @@ msgstr "選択をリセット"
 msgid "Reload the packages list"
 msgstr "パッケージリストを読み直す"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "メディアを更新"
@@ -1507,7 +1512,7 @@ msgstr ""
 "マネージャを起動して、'セキュリティアップデート'のメディアを\n"
 "追加します。\n"
 "\n"
-"その後でMandrakelinuxアップデートを再起動してください。"
+"その後で%sを再起動してください。"
 
 #: ../rpmdrake:1170
 #, c-format
@@ -1755,12 +1760,17 @@ msgid ""
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 msgstr ""
-"Mandrakelinuxアップデートへようこそ\n"
+"%sへようこそ\n"
 "\n"
 "このツールではRPMをアップデートすることができます。"
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1773,158 +1783,181 @@ msgstr ""
 "MandrakelinuxのCDROM/DVDには多くのRPMを収録しています。\n"
 "このツールではRPMをインストールすることができます。"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "RPMのアップデート"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinuxアップデート"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "いいえ"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "はい"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "情報"
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "オーストリア"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "オーストラリア"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "ベルギー"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "ブラジル"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "カナダ"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "コスタリカ"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "チェコ"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "ドイツ"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "デンマーク"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "ギリシャ"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "スペイン"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "フィンランド"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "フランス"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "イスラエル"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "イタリア"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "韓国"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "オランダ"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "ノルウェー"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "ポーランド"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "ポルトガル"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "ロシア"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "スウェーデン"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "台湾"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "イギリス"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "中国"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "アメリカ"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Mandrakesoftのウェブサイトに接続してミラーサイトのリストを取得\n"
+"します。ネットワークが有効になっているか確認してください。\n"
+"\n"
+"続けますか?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1937,19 +1970,40 @@ msgstr ""
 "\n"
 "続けますか?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"お待ちください。Mandrakesoftのウェブサイトからミラーサイトを取得中です。"
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 "お待ちください。Mandrakesoftのウェブサイトからミラーサイトを取得中です。"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "ダウンロード中にエラー"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"ミラーリストをダウンロード中にエラーが発生:\n"
+"\n"
+"%s\n"
+"ネットワークかMandrakesoftのウェブサイトが利用不能になっているようです。\n"
+"後でやりなおしてみてください。"
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1964,12 +2018,17 @@ msgstr ""
 "ネットワークかMandrakesoftのウェブサイトが利用不能になっているようです。\n"
 "後でやりなおしてみてください。"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "ミラーなし"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1984,63 +2043,63 @@ msgstr ""
 "アーキテクチャをMandrakelinuxの公式アップデートでは\n"
 "サポートしていない場合です。"
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "ミラーを選んでください。"
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "メディア`%s'用のファイルをコピー.."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "メディア %s のファイルを調べています.."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "メディア %s のリモートファイルを調べています.."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr "完了しました。"
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr "は失敗しました。"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s (メディア %s)"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "`%s'のダウンロードを開始.."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "'%s'をダウンロード。残り時間:%s, 速度:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s'をダウンロード。速度:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "パッケージ検索中にエラー"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2056,17 +2115,17 @@ msgstr ""
 "改めて追加してください。後者の場合は、しばらくたってからやり直して\n"
 "ください。"
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "更新するメディアを選んでください:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2079,7 +2138,7 @@ msgstr ""
 "エラー:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2090,17 +2149,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "メディアを作成できません。"
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "メディアの追加に失敗"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2111,7 +2170,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"更新メディアに指定されている %s は現在お使いのMandrakelinuxのバージョン(%s)と"
+"合っていません。\n"
+"無効しします。"
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2380,10 +2450,6 @@ msgstr "判別不能な転送エンコード\n"
 msgid "Unknown error code %d\n"
 msgstr "未知のエラーコード %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinuxアップデート"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "RPMをインストール"
diff --git a/po/ko.po b/po/ko.po
index 7a92a44f..2fa5e659 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\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"
@@ -63,7 +63,7 @@ msgstr "탈착식 장치"
 msgid "Path or mount point:"
 msgstr "경로 또는 마운트 위치:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "보안 업데이트"
@@ -130,9 +130,9 @@ msgstr "소스 유형:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "취소"
@@ -141,10 +141,10 @@ msgstr "취소"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "확인"
@@ -325,8 +325,8 @@ msgstr ""
 msgid "Command"
 msgstr "캐나다"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(없음)"
@@ -413,7 +413,7 @@ msgstr "소스 업데이트"
 msgid "Regenerate hdlist"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "기다려 주세요. 매체 업데이트 중..."
@@ -507,12 +507,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -520,568 +520,568 @@ msgid ""
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "내게 필요한 설정"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "파일 꾸리기"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "백업"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "CD 굽기"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "압축"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "기타"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, fuzzy, c-format
 msgid "Books"
 msgstr "기타"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "통신"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "자료틀"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "개발"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr ""
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr ""
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, fuzzy, c-format
 msgid "Java"
 msgstr "일본"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr ""
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, fuzzy, c-format
 msgid "Editors"
 msgstr "편집"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "통신"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "에뮬레이터"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "파일 도구"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, fuzzy, c-format
 msgid "Games"
 msgstr "기타"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "모험"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "아케이드"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "보드"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "카드"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "퍼즐"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "스포츠"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "전략"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr ""
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "인라이튼먼트"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "그놈"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr ""
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "소피쉬"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr ""
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "그림"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "그냥 둠"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "멀티미디어"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, fuzzy, c-format
 msgid "Networking"
 msgstr "그냥 둠"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, fuzzy, c-format
 msgid "Chat"
 msgstr "중국"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "파일 전송"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "인스턴스 메시지"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, fuzzy, c-format
 msgid "Mail"
 msgstr "브라질"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "뉴스"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, fuzzy, c-format
 msgid "Remote access"
 msgstr ".%s 제거"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "월드와이드웹"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "사무용 도구"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "출판"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "과학"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "천문학"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "생물학"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "화학"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "전산학"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "지구과학"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "수학"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "물리학"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "명령 해석기"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "소리"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "시스템"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr ""
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, fuzzy, c-format
 msgid "Configuration"
 msgstr "소스 설정"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "부팅과 초기화"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "하드웨어"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "팩키지 관리"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "인쇄"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "개발"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "개발"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "폰트"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "콘솔"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr ""
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr ""
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr ""
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr ""
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "터미널"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "텍스트 도구"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "장난감"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "비디오"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(유효하지 않음)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "검색 결과"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "검색 결과(없음)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "기다려 주세요. 검색 중..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "중지"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "업그레이드 가능"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "추가 가능"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "선택됨"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, fuzzy, c-format
 msgid "Not selected"
 msgstr "충돌이 감지되었습니다."
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, fuzzy, c-format
 msgid "Rpmdrake %s"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "추가 팩키지 정보..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "선택하세요"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "다음 팩키지들 중 하나가 필요합니다:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "기다려 주세요. 팩키지 목록 정렬 중..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "업데이트 없음"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1092,28 +1092,28 @@ msgstr ""
 "팩키지에 대한 업데이트가 없거나,\n"
 "이미 다 설치된 경우입니다."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "모두"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, fuzzy, c-format
 msgid "Information on packages"
 msgstr "추가 팩키지 정보..."
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "일부 팩키지가 더 제거 되어야 합니다."
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1124,19 +1124,19 @@ msgstr ""
 "다음 팩키지들도 제거 되어야 합니다:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, fuzzy, c-format
 msgid "Some packages can't be removed"
 msgstr "[%s] 팩키지를 설치할 수 없습니다.\n"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1147,12 +1147,12 @@ msgstr ""
 "지금 선택 해제되어야 합니다:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "추가 팩키지가 필요합니다."
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1163,17 +1163,17 @@ msgstr ""
 "설치되어야 합니다.\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, fuzzy, c-format
 msgid "Some packages can't be installed"
 msgstr "[%s] 팩키지를 설치할 수 없습니다.\n"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, fuzzy, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1183,132 +1183,137 @@ msgstr ""
 "다음 팩키지들은 선택될 수 없습니다:\n"
 "\n"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "일부 팩키지는 제거되어야 합니다."
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "선택된 용량: %d MB / 여유 공간: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "선택된 크기: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, fuzzy, c-format
 msgid "Files:\n"
 msgstr "%s파일들:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "변경사항:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "설치된 버전:"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "이름: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "버전: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "크기: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "중요도: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "요약 설명: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "업데이트 이유:"
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "설명:"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "버그수정 업데이트"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "일반 업데이트"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "맨드레이크 선택"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "모든 팩키지, 가나다순"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, fuzzy, c-format
 msgid "All packages, by group"
 msgstr "모든 팩키지"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, fuzzy, c-format
 msgid "All packages, by size"
 msgstr "모든 팩키지"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, fuzzy, c-format
 msgid "All packages, by selection state"
 msgstr "선택 상태별"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, fuzzy, c-format
 msgid "All packages, by medium repository"
 msgstr "소스 등록별"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, fuzzy, c-format
 msgid "All packages, by update availability"
 msgstr "업데이트 가능성별"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
@@ -1338,7 +1343,7 @@ msgstr "선택 재설정"
 msgid "Reload the packages list"
 msgstr "팩키지 목록 다시 읽기"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, fuzzy, c-format
 msgid "Update media"
 msgstr "소스 업데이트"
@@ -1736,13 +1741,18 @@ msgid ""
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 msgstr ""
-"맨드레이크 업데이트에 잘 오셨습니다!\n"
+"%s에 잘 오셨습니다!\n"
 "\n"
 "이 도구는 컴퓨터에 설치할 업데이트된 소프트웨어를 선택할 수 있도록\n"
 "도와 줍니다."
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1757,158 +1767,181 @@ msgstr ""
 "록\n"
 "도와 줍니다."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "소프트웨어 팩키지 제거"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "맨드레이크 업데이트"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "아니오"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "예"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "정보..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "오스트리아"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "오스트레일리아"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "벨기에"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "브라질"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "캐나다"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "코스타리카"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "체코 공화국"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "독일"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "덴마크"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "그리스"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "스페인"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "핀란드"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "프랑스"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "이스라엘"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "이태리"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "일본"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "대한민국"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "네덜란드"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "노르웨이"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "폴란드"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "포르투갈"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "러시아"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "스웨덴"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "대만"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "영국"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "중국"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "미국"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"미러 목록을 가져오기 위해서 맨드레이크소프트 웹사이트에 접속해야 합니다.\n"
+"현재 네트웍이 가능한지 확인하세요.\n"
+"\n"
+"계속할까요?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1921,19 +1954,40 @@ msgstr ""
 "\n"
 "계속할까요?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"기다려 주세요. 맨드레이크소프트 웹사이트에서 미러 목록을 내려받고 있습니다."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 "기다려 주세요. 맨드레이크소프트 웹사이트에서 미러 목록을 내려받고 있습니다."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "내려받기 중 오류"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"미러 목록을 내려받는 도중에 오류가 있었습니다:\n"
+"\n"
+"%s\n"
+"네트웍 또는 맨드레이크소프트 웹사이트가 현재 유효하지 않은 듯 합니다.\n"
+"나중에 다시 시도해 보세요."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1948,12 +2002,17 @@ msgstr ""
 "네트웍 또는 맨드레이크소프트 웹사이트가 현재 유효하지 않은 듯 합니다.\n"
 "나중에 다시 시도해 보세요."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "미러 없음"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1968,63 +2027,63 @@ msgstr ""
 "이 컴퓨터의 프로세서를 맨드레이크 리눅스 공식 업데이트가\n"
 "지원하지 않는 경우입니다."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "희망하는 미러를 선택하세요."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, fuzzy, c-format
 msgid " failed!"
 msgstr "파일별"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
 msgstr "[%s]의 서명 검증 중 ..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2035,17 +2094,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
 msgstr "업데이트하려는 소스을 선택해 주세요:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "업데이트 버전"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, fuzzy, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2054,7 +2113,7 @@ msgid ""
 "%s"
 msgstr "매체를 업데이트할 수 없습니다; 자동으로 사용불가될 것입니다."
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2062,17 +2121,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "매체를 생성할 수 없습니다."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "기다려 주세요. 매체 추가 중..."
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2083,7 +2142,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2351,10 +2418,6 @@ msgstr ""
 msgid "Unknown error code %d\n"
 msgstr "알 수 없는 오류코드 %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "맨드레이크 업데이트"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "소프트웨어 설치"
diff --git a/po/ky.po b/po/ky.po
index 32981a20..52c62994 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-ky\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-09-28 18:46+0600\n"
 "Last-Translator: Timur Jamakeev <ztimur@mail.ru>\n"
 "Language-Team: Kyrgyz\n"
@@ -55,7 +55,7 @@ msgstr "Чыкчу түзүлүш"
 msgid "Path or mount point:"
 msgstr "Жол же биригүү чекити:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Коопсуздук боюнча жаңылоо"
@@ -122,9 +122,9 @@ msgstr "Булак тиби:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Калтыруу"
@@ -133,10 +133,10 @@ msgstr "Калтыруу"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -317,8 +317,8 @@ msgstr "Булак предели"
 msgid "Command"
 msgstr "Команда"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(эч нерсе)"
@@ -407,7 +407,7 @@ msgstr "Булакты жаңылоо"
 msgid "Regenerate hdlist"
 msgstr "hdlist регенерациялоо"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Күтө туруңуз, булак жаңыланууда..."
@@ -511,12 +511,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "`%s' булагы ийгиликтүү кошулду."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Колдонуучу режиминде иштетилүүдө"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -527,569 +527,569 @@ msgstr ""
 "иштетүүдөсүз. Сиз системаны өзгөртө албайсыз,\n"
 "бирок бар берилиштер базасын көрө аласыз."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Ыңгайлуулуктар"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Архивдөө"
 
 # used in the stats page table
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Резервдөө"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "CD жазуу"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Кысуу"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Башка"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Китептер"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Компьютердик китептер"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Көп берилчү суроолор"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "HOWTO"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Адабият"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Кластер"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "Кабарларды жөнөтүү"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "Сервистерди түзүү"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Коммуникация"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Берилишер базасы"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Түзүү"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME жана GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE жана Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Ядро"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Терүү тиркемелдери"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Билим берүү"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Эмуляторлор"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Файл куралдары"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Оюндар"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Жорук оюндары"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Аркада оюндары"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Стол оюндары"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Карта оюндары"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Баш катырма оюндары"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Спорт оюндары"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Стратегия оюндары"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Графикалык иш столу"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM негизинде"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Графика"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Мониторинг"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Мультимедиа"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Тармактар"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Чат"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Файл жөнөтүү"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Тез кабарлар менен алмашуу"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Почта"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Жаңылыктар"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Алыстан кирүү"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Офис"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Публикалык ачкычтар"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Басмакана"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Илим"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Астрономия"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Биология"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Химия"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Компьютер илими"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "География"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Математика"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Физика"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Шел-чөйрөлөрү"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Добуш"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Система"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Стандарттык"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Конфигурациялоо"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Баштапкы жүктөө жана инициализациялоо"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Техникалык жабдуу"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Пакеттер"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Басуу системасы"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "Орнотуу"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Орнотуу"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Шрифтер"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Консоль"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Интернационалдаштыруу"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Ядро жана техникалык жабдуу"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Библиотекалар"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Серверлер"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Терминалдар"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Тексттик куралдар"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Оюнчуктар"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Мүмкүн эмес)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Издөө жыйынтыктары"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Издөө жыйынтыктары (жок)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Күтө туруңуз, изделүүдө..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Жаңыртса болот"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Кошсо болот"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Тандалган"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Тандалган эмес"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Пакет жөнүндө кошумча маалымат..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Тандаңыз"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Төмөнкү пакеттердин бири талап кылынат:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Күтө туруңуз, пакеттердин тизмеси түзүлүүдө..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Жаңылоосу жок"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1100,28 +1100,28 @@ msgstr ""
 "орнотулган пакеттер үчүн жаңылоо жокутугун, же алар\n"
 "алдагачан орнотулгандыгын түшүндүрөт."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Бардыгы"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Кошумча маалымат"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Пакеттер жөнүндөгү маалымат"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Кээ бир пакеттерди алып салуу талап кылынат"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1132,12 +1132,12 @@ msgstr ""
 "салынуусу талап кылынат:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Кээ бир пакеттерди алып салууга болбойт"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1147,7 +1147,7 @@ msgstr ""
 "бузулуусуна алып келиши мүмкүн:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1158,12 +1158,12 @@ msgstr ""
 "учурда тандалбашы керек:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Кошумча пакеттер талап кылынат"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1174,17 +1174,17 @@ msgstr ""
 "пакетти(терди) орнотуу талап кылынат:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (өткөрүү тизмесине таандык)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Кээ бир пакеттерди орнотуу мүмкүн эмес"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1195,132 +1195,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Кээ бир пакеттер алынып салынуусу талап кылынат"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Тандалганы: %d Мб / Бош диск көлөмү: %d Мб"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Тандалган көлөмү: %d Мб"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Бул пакет үчүн баян жок\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Файлдар:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Булак:"
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Учурдагы орнотулган версиясы: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Аты: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Версиясы: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Көлөмү: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s Кб"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Маанилүүлүгү:"
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Жыйынтыгы:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Жаңылоо себеби: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Баяны: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Баг-фикстерди жаңылоо"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Нормалдык жаңылоо"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux тандоо"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Бардык пакеттер алфавит боюнча"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Бардык пакеттер группалар боюнча"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Бардык пакеттер көлөмү боюнча"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Бардык пакеттер, тандоо абалы боюнча"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Бардык пакеттер сакталуу булактары боюнча"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Бардык пакеттер жаңылануу мүмкүнчүлүгү боюнча"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Орнотуу датасы боюнча сорттолгон, калган пакеттер гана"
@@ -1350,7 +1355,7 @@ msgstr "Тандоону алып таштоо"
 msgid "Reload the packages list"
 msgstr "Пакеттер тизмесин кайра жүктөө"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Булакты жаңылоо"
@@ -1768,6 +1773,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1781,160 +1791,184 @@ msgstr ""
 "миң программалык пакеттер менен кошо келет. Бул курал компьютериңизге\n"
 "сиз тандаган программаларды орнотууга жардам берет."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Программа пакеттерин жаңылоо"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux жаңылоосу"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Жок"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Ооба"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Маалымат..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Австрия"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Австралия"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Бельгия"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Бразилия"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Коста-Рика"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Чех Республикасы"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Германия"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Дания"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Греция"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Испания"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Финляндия"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Франция"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Израиль"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Италия"
 
 # used in the stats page table
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Япония"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Корея"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Нидерланды"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Норвегия"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Польша"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Португалия"
 
 # used in the stats page table
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Россия"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Швеция"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Тайвань"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Улуу Британия"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Кытай"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Кошмо Штаттары"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Мен күзгүлөр тизмесин алуу үчүн Mandrakesoft веб-сайты\n"
+"менен байланышуум керек. Тармагыңыздын иштеп жаткандыгын\n"
+"текшериңиз.\n"
+"\n"
+"Улантууга даярсызбы?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1948,18 +1982,38 @@ msgstr ""
 "\n"
 "Улантууга даярсызбы?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Күтө туруңуз, Mandrakesoft веб-сайтынан күзгүлөр тизмеси жүктөлүүдө."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Күтө туруңуз, Mandrakesoft веб-сайтынан күзгүлөр тизмеси жүктөлүүдө."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Жүктөө учурундагы ката"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Күзгүлөр тизмесин жүктөө учурунда ката пайда болду:\n"
+"\n"
+"%s\n"
+"Тармак же Mandrakesoft веб-сайты мүмкүн эмес.\n"
+"Кийинчерээк кайрадан аракет кылып көрүңүз."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1974,12 +2028,17 @@ msgstr ""
 "Тармак же Mandrakesoft веб-сайты мүмкүн эмес.\n"
 "Кийинчерээк кайрадан аракет кылып көрүңүз."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Күзгү жок"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1994,64 +2053,64 @@ msgstr ""
 "негизинен бул сиздин процессордун архитектурасын\n"
 "Mandrakelinux Официалдык Жаңылоолору колдобойт."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Өтүнүч, каалаган күзгүнү тандаңыз."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' булагы үчүн файл көчүрүлүүдө..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "`%s' булагынын файлы изилденүүдө..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "`%s' булагынын алыскы файлы изилденүүдө..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " аткарылды."
 
 # used in the stats page table
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " ишке ашпады!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s %s булагынан"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "`%s' жүктөө башталды ..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' жүктөлүүсү, калган убакыт:%s, ылдамдык:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' жүктөлүүсү, ылдамдык:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Пакеттерди алуу учурундагы ката"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2068,17 +2127,17 @@ msgstr ""
 "булакка учурда жетүүгө мүмкүн эмес кийинчерээк кайрадан\n"
 "аракет кылып көрүңүз."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Жаңылоо үчүн булак тандаңыз:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Жаңылоо"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2091,7 +2150,7 @@ msgstr ""
 "Каталар:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2102,17 +2161,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Булакты түзүүгө мүмкүн эмес."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Булакты кошуу ийгиликсиздиги"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2123,7 +2182,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"Жаңылоо үчүн колдонулуп жаткан сиздин `%s' булагыңыз иштеп жаткан\n"
+"Mandrakelinux (%s) версиясына туура келбейт.\n"
+"Ал колдонулуудан алынып салынат."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2392,10 +2462,6 @@ msgstr "Берүүнүн белгисиз шифрдангандыгы\n"
 msgid "Unknown error code %d\n"
 msgstr "%d белгисиз ката коду\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux жаңылоосу"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Программаны орнотуу"
diff --git a/po/lt.po b/po/lt.po
index 9a972de7..447aa064 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\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"
@@ -60,7 +60,7 @@ msgstr "Išmesti laikmeną"
 msgid "Path or mount point:"
 msgstr "prijungimo vieta:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Saugumo atnaujinimai"
@@ -125,9 +125,9 @@ msgstr "Laikmenos tipas:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Nutraukti"
@@ -136,10 +136,10 @@ msgstr "Nutraukti"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Gerai"
@@ -322,8 +322,8 @@ msgstr ""
 msgid "Command"
 msgstr "Domeno vardas"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(jokio)"
@@ -412,7 +412,7 @@ msgstr "Atnaujinti laikmeną"
 msgid "Regenerate hdlist"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr ""
@@ -502,12 +502,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -515,570 +515,570 @@ msgid ""
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Prieinamumas"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Archyvavimas"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Atsarginės kopijos"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "CD kepimas"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Suspaudimas"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Kitas"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, fuzzy, c-format
 msgid "Books"
 msgstr "Kitas"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Ryšiai"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Duombazės"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, fuzzy, c-format
 msgid "Development"
 msgstr "Kūrimo atnaujinimai"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr ""
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr ""
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, fuzzy, c-format
 msgid "KDE and Qt"
 msgstr "Kūrimo atnaujinimai"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, fuzzy, c-format
 msgid "Kernel"
 msgstr "bendras"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, fuzzy, c-format
 msgid "Editors"
 msgstr "Redaguoti"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Ryšiai"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emuliatoriai"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Bylų įrankiai"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, fuzzy, c-format
 msgid "Games"
 msgstr "Pavadinimas"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Nuotykiai"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arkada"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Lentos"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kortos"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Dėlionės"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sportas"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategija"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr ""
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr ""
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr ""
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Kompiuteris: "
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedija"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, fuzzy, c-format
 msgid "Networking"
 msgstr "Tinklas"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Pokalbiai"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Bylų siuntimas"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Greitų pranešimų siuntimas"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Paštas"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Naujienos"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, fuzzy, c-format
 msgid "Remote access"
 msgstr "Išimama"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Biuro programos"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Spausdinimas"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Mokslai"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomija"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologija"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Chemija"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Informatika"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Gamtos mokslai"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "SHell'ai"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Garsas"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sistema"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr ""
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, fuzzy, c-format
 msgid "Configuration"
 msgstr ""
 "Atnaujinti\n"
 "laikmeną"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Įkrova ir paleidimas"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Geležis"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Paketai"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, fuzzy, c-format
 msgid "Printing"
 msgstr "Dėmesio"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Kūrimo atnaujinimai"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Kūrimo atnaujinimai"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Šriftai"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konsolė"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, fuzzy, c-format
 msgid "True type"
 msgstr "Tipas"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, fuzzy, c-format
 msgid "Type1"
 msgstr "Tipas"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr ""
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr ""
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr ""
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminalai"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Teksto įrankiai"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Žaislai"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Vaizdas"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, fuzzy, c-format
 msgid "Search results"
 msgstr "Paieškos rezultatai"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, fuzzy, c-format
 msgid "Search results (none)"
 msgstr "Paieškos rezultatai"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, fuzzy, c-format
 msgid "Please wait, searching..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, fuzzy, c-format
 msgid "Stop"
 msgstr "Sektorius"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, fuzzy, c-format
 msgid "Addable"
 msgstr "Galimi"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, fuzzy, c-format
 msgid "Selected"
 msgstr "Pasirinkti visus"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, fuzzy, c-format
 msgid "Not selected"
 msgstr "Rasti konfliktai"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, fuzzy, c-format
 msgid "Rpmdrake %s"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, fuzzy, c-format
 msgid "Please choose"
 msgstr "Prašom patvirtinti"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vienas iš šių paketų yra reikalingas."
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, fuzzy, c-format
 msgid "Please wait, listing packages..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, fuzzy, c-format
 msgid "No update"
 msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1086,29 +1086,29 @@ msgid ""
 "or you already installed all of them."
 msgstr ""
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Visos"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, fuzzy, c-format
 msgid "Information on packages"
 msgstr "Negaliu atidaryti paketo"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, 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:579
+#: ../rpmdrake:575
 #, fuzzy, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1118,19 +1118,19 @@ msgstr ""
 "Kad būtų patenkintos visos priklausomybės,\n"
 "šie paketai bus pašalinti:"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, fuzzy, c-format
 msgid "Some packages can't be removed"
 msgstr "Paketas `%s' negali būti įdiegtas\n"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1138,12 +1138,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1151,17 +1151,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, fuzzy, c-format
 msgid "Some packages can't be installed"
 msgstr "Paketas `%s' negali būti įdiegtas\n"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, fuzzy, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1169,132 +1169,137 @@ msgid ""
 "%s"
 msgstr "Paketas `%s' negali būti įdiegtas\n"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, fuzzy, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "%d pažymėti paketai: %.1f MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, fuzzy, c-format
 msgid "Selected size: %d MB"
 msgstr "%d pažymėti paketai: %.1f MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, fuzzy, c-format
 msgid "Files:\n"
 msgstr "/_Byla"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Pavadinimas: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Versija: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Dydis"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, fuzzy, c-format
 msgid "Importance: "
 msgstr "Svarba: %s\n"
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Turinys"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Aprašymai"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, fuzzy, c-format
 msgid "Bugfixes updates"
 msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, fuzzy, c-format
 msgid "Normal updates"
 msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr ""
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, fuzzy, c-format
 msgid "All packages, by group"
 msgstr "0 paketų, 0 baitų"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, fuzzy, c-format
 msgid "All packages, by size"
 msgstr "0 paketų, 0 baitų"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr ""
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, fuzzy, c-format
 msgid "All packages, by medium repository"
 msgstr "0 paketų, 0 baitų"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
@@ -1324,7 +1329,7 @@ msgstr ""
 msgid "Reload the packages list"
 msgstr "Paketas %s nėra pasirašytas"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, fuzzy, c-format
 msgid "Update media"
 msgstr "Atnaujinti laikmeną"
@@ -1701,6 +1706,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1709,158 +1719,177 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Ruošiamasi paketo diegimui"
+
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Mandrakelinux Update"
+msgstr "Skaidrių šou"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Taip"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, fuzzy, c-format
 msgid "Austria"
 msgstr "nuoseklioji"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, fuzzy, c-format
 msgid "Australia"
 msgstr "nuoseklioji"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, fuzzy, c-format
 msgid "Belgium"
 msgstr "Belgų"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brazilija"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Čekija"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Vokiečių"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, fuzzy, c-format
 msgid "Greece"
 msgstr "Graikų"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Ispanija"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, fuzzy, c-format
 msgid "Finland"
 msgstr "Surasti:"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, fuzzy, c-format
 msgid "France"
 msgstr "Nutraukti"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, fuzzy, c-format
 msgid "Israel"
 msgstr "Įdiegti"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, fuzzy, c-format
 msgid "Italy"
 msgstr "Įdiegti"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japonija"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, fuzzy, c-format
 msgid "Korea"
 msgstr "Dar"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Olandija"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, fuzzy, c-format
 msgid "Norway"
 msgstr "Norvegų"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Lenkija"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugalija"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, fuzzy, c-format
 msgid "Russia"
 msgstr "Rusų"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, fuzzy, c-format
 msgid "Sweden"
 msgstr "Pasižiūrėti"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, fuzzy, c-format
 msgid "Taiwan"
 msgstr "Vieta"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Jungtinė karalystė"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Kinija"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "Jungtinės amerikos valstijos"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1869,18 +1898,35 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Prašom palaukti\n"
+"Išmetama laikmena"
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Klaida siunčiant"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1890,12 +1936,17 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, fuzzy, c-format
 msgid "No mirror"
 msgstr "Lemtinga klaida"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1905,65 +1956,65 @@ msgid ""
 "by Mandrakelinux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, fuzzy, c-format
 msgid "Please choose the desired mirror."
 msgstr ""
 "Prašom palaukti\n"
 "Gabenamas veidrodžių sąrašas"
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, fuzzy, c-format
 msgid " failed!"
 msgstr "%d bylos"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
 msgstr "Tikrinu '%s' parašą..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -1974,17 +2025,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr ""
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Atnaujinti"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -1993,7 +2044,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2001,19 +2052,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, fuzzy, c-format
 msgid "Unable to create medium."
 msgstr "Nepavyko sukurti raporto bylos, nutraukiu.\n"
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2024,7 +2075,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2291,11 +2350,6 @@ msgstr ""
 msgid "Unknown error code %d\n"
 msgstr "Nežinomas klaidos kodas %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-#, fuzzy
-msgid "Mandrakelinux Update"
-msgstr "Skaidrių šou"
-
 #: data/rpmdrake.desktop.in.h:1
 #, fuzzy
 msgid "Install Software"
diff --git a/po/ltg.po b/po/ltg.po
index 754c7dde..962f0c8f 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-02-14 14:21+0200\n"
 "Last-Translator: Unknown :-(\n"
 "Language-Team: Latgalian <ll10nt@listes.murds.lv>\n"
@@ -54,7 +54,7 @@ msgstr "/Izjimt beigtūs failus"
 msgid "Path or mount point:"
 msgstr "Samba monteišonys punkti"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, fuzzy, c-format
 msgid "Security updates"
 msgstr "Drūšeibys trauksmis:"
@@ -121,9 +121,9 @@ msgstr "Instalacejis tips"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Atceļt"
@@ -132,10 +132,10 @@ msgstr "Atceļt"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Labi"
@@ -314,8 +314,8 @@ msgstr "Medeju klase"
 msgid "Command"
 msgstr "Komanda"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(nikas)"
@@ -402,7 +402,7 @@ msgstr "Modernizeijumi"
 msgid "Regenerate hdlist"
 msgstr "Vyspuoreji"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr "lyudzu pagaidit cikom izpyldās ttmkfdir..."
@@ -488,12 +488,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -501,568 +501,568 @@ msgid ""
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Pīejameiba"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Arhiveišona"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Rezervis kopeišona"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Kompaktdisku īraksteišona"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Kompreseja"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Cyts"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, fuzzy, c-format
 msgid "Books"
 msgstr "Suoknēt"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, fuzzy, c-format
 msgid "Computer books"
 msgstr "Datorzynuotne"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, fuzzy, c-format
 msgid "Howtos"
 msgstr "Hostdators %s"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, fuzzy, c-format
 msgid "Literature"
 msgstr "Alternativi"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Komunikacejis"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Datubāzis"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Izstruode"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr ""
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr ""
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, fuzzy, c-format
 msgid "Java"
 msgstr "Japuona"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, fuzzy, c-format
 msgid "KDE and Qt"
 msgstr "Datums i laiks"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, fuzzy, c-format
 msgid "Kernel"
 msgstr "Kūduls:"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, fuzzy, c-format
 msgid "Perl"
 msgstr "Peru"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, fuzzy, c-format
 msgid "Python"
 msgstr "Ceļš"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Redaktori"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Komunikacejis"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Failu reiki"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, fuzzy, c-format
 msgid "Games"
 msgstr "Spieļu"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Pīdzeivuojumi"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Golda"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kartys"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Gryuši atrysynomys"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, fuzzy, c-format
 msgid "Sports"
 msgstr "USB printers"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Strategeja"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, fuzzy, c-format
 msgid "Graphical desktop"
 msgstr "Cytys grafiskuos dorbaviersmys"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, fuzzy, c-format
 msgid "Enlightenment"
 msgstr "Vide"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr ""
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr ""
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, fuzzy, c-format
 msgid "Sawfish"
 msgstr "Spānejis"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, fuzzy, c-format
 msgid "WindowMaker"
 msgstr "Windows"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Nūvāruošona"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedeja"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Teikluošona"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Pļuopuošona"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Failu puorsyuteišona"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Interneta peidžers"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Posts"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Jaunumi"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Attuola pīkliušona"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "Puorstaipteiklys"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Ofiss"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Publiceišona"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Zynuotnis"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomeja"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Biologeja"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Kimeja"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Datorzynuotne"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Geozynuotnis"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Čaulys"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Skaņa"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sistema"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, fuzzy, c-format
 msgid "Base"
 msgstr "Bass"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Konfiguraceja"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Īluode i inicializaceja"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Dzelži"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, fuzzy, c-format
 msgid "Packaging"
 msgstr "Pakūtne:"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Drukuošona"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Izstruode"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Izstruode"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Fonti"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konsole"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, fuzzy, c-format
 msgid "True type"
 msgstr "Uztvierieja tips:"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, fuzzy, c-format
 msgid "Type1"
 msgstr "Tips"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, fuzzy, c-format
 msgid "X11 bitmap"
 msgstr "16 biti"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, fuzzy, c-format
 msgid "Internationalization"
 msgstr "Interneta dators"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, fuzzy, c-format
 msgid "Kernel and hardware"
 msgstr "Nūteiktuo aparatura"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, fuzzy, c-format
 msgid "Libraries"
 msgstr "Libereja"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, fuzzy, c-format
 msgid "Servers"
 msgstr "Servers"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, fuzzy, c-format
 msgid "XFree86"
 msgstr "XFree %s"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Terminali"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Teksta reiki"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Rūtaļlītys"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, fuzzy, c-format
 msgid "(Not available)"
 msgstr "Nav pīejamu sadaļu"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, fuzzy, c-format
 msgid "Search results"
 msgstr "Meklēt serverus"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr ""
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, fuzzy, c-format
 msgid "Please wait, searching..."
 msgstr "Lyudzu, uzgaidit..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "Rfbdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Apturēt"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, fuzzy, c-format
 msgid "Upgradable"
 msgstr "Atjaunynuot"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, fuzzy, c-format
 msgid "Addable"
 msgstr "atslēgt"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, fuzzy, c-format
 msgid "Selected"
 msgstr "Izavielēt vysys"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, fuzzy, c-format
 msgid "Not selected"
 msgstr "Nav izvalāts NIC!"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, fuzzy, c-format
 msgid "Rpmdrake %s"
 msgstr "Atjaunynuot %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, fuzzy, c-format
 msgid "More information on package..."
 msgstr "Stereo (ja pīejams)"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, fuzzy, c-format
 msgid "Please choose"
 msgstr "Lyudzu izavielejit jiusu vaļsti."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, fuzzy, c-format
 msgid "One of the following packages is needed:"
 msgstr "Tiks instaleitys sekūjūšys pakūtnis:\n"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, fuzzy, c-format
 msgid "Please wait, listing packages..."
 msgstr "Lyudzu uzgaidit, uzstuodu drūšeibys leimini"
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, fuzzy, c-format
 msgid "No update"
 msgstr "Nav printera"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1070,28 +1070,28 @@ msgid ""
 "or you already installed all of them."
 msgstr ""
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Vyss"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, fuzzy, c-format
 msgid "More info"
 msgstr "Vairuok opceju"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, fuzzy, c-format
 msgid "Information on packages"
 msgstr "Informaceja atjaunynuota."
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, fuzzy, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Tiks nūjimtys sekuojūšys pakūtnis"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1099,19 +1099,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, fuzzy, c-format
 msgid "Some packages can't be removed"
 msgstr "Tiks nūjimtys sekūjūšys %s pakūtnis"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1119,12 +1119,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, fuzzy, c-format
 msgid "Additional packages needed"
 msgstr "Papyldus temys"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1132,17 +1132,17 @@ msgid ""
 "\n"
 msgstr "Tiks instaleitys sekūjūšys pakūtnis:\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, fuzzy, c-format
 msgid "Some packages can't be installed"
 msgstr "Instalejamū pakūtņu izviele"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, fuzzy, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1150,132 +1150,137 @@ msgid ""
 "%s"
 msgstr "Tiks instaleitys sekūjūšys pakūtnis:\n"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, fuzzy, c-format
 msgid "Some packages need to be removed"
 msgstr "Tiks nūjimtys sekūjūšys %s pakūtnis"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, fuzzy, c-format
 msgid "Selected size: %d MB"
 msgstr "Faila izmārs: %d B"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, fuzzy, c-format
 msgid "Files:\n"
 msgstr "Faili"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, fuzzy, c-format
 msgid "Changelog:\n"
 msgstr "Kanali:"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, fuzzy, c-format
 msgid "Currently installed version: "
 msgstr "Pošreizejuos saskarnis konfiguraceju"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Vuords: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Verseja: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Izmārs: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, fuzzy, c-format
 msgid "%s KB"
 msgstr "Apjoms: %d KB\n"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Svareigums: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Kūpsavylkums:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Aproksts:"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, fuzzy, c-format
 msgid "Normal updates"
 msgstr "Normals režims"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, fuzzy, c-format
 msgid "Mandrakelinux choices"
 msgstr "Manuali"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr ""
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, fuzzy, c-format
 msgid "All packages, by selection state"
 msgstr "Saglobuot pakūtņu izvieli"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr ""
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
@@ -1305,7 +1310,7 @@ msgstr "Ceļa izviele"
 msgid "Reload the packages list"
 msgstr "Instalejamū pakūtņu izviele"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, fuzzy, c-format
 msgid "Update media"
 msgstr "Modernizeijumi"
@@ -1666,6 +1671,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1674,158 +1684,177 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Programmaturys puorvaldeišona"
+
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakestore"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Nā"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Da"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, fuzzy, c-format
 msgid "Info..."
 msgstr "Info"
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Austreja"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Australeja"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Beļgeja"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brazīleja"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Čehejis Republika"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Vuoceja"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, fuzzy, c-format
 msgid "Danmark"
 msgstr "Dāneja"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grīkeja"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Spāneja"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Sūmeja"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Franceja"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Izraela"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Itāleja"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japuona"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Koreja"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Holande"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norvegeja"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Pūleja"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugāle"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Krīveja"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Zvīdreja"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taivana"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Apvīnuotuo Karaliste"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Kīna"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "A.S.V."
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1834,18 +1863,33 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "lyudzu pagaidit cikom izpyldās ttmkfdir..."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, fuzzy, c-format
 msgid "Error during download"
 msgstr "Kliuda, atjaunojūt izvieļni"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1855,12 +1899,17 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, fuzzy, c-format
 msgid "No mirror"
 msgstr "Trūksnis"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1870,63 +1919,63 @@ msgid ""
 "by Mandrakelinux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, fuzzy, c-format
 msgid "Please choose the desired mirror."
 msgstr "Izavielejit vālamū drūšeibys leimini?"
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, fuzzy, c-format
 msgid " done."
 msgstr "gotovs"
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, fuzzy, c-format
 msgid " failed!"
 msgstr "Naveiksmeiga pīsateikšona"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
 msgstr "Aizveru sistemu..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, fuzzy, c-format
 msgid "Error retrieving packages"
 msgstr "Pakūtņu kuortuošonys laikā atkluota kliuda:"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -1937,17 +1986,17 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
 msgstr "Izavielejit cytu datu nesieju, nu kura atjaunuot"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, fuzzy, c-format
 msgid "Update"
 msgstr "Modernizeijumi"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -1956,7 +2005,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, fuzzy, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -1964,17 +2013,17 @@ msgid ""
 "%s"
 msgstr "Nevar atdalīt: %s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, fuzzy, c-format
 msgid "Unable to create medium."
 msgstr "Nav īspiejams izveiduot mdkupdate medium.\n"
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -1982,7 +2031,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2275,11 +2332,6 @@ msgstr ""
 msgid "Unknown error code %d\n"
 msgstr ""
 
-#: data/mandrakeupdate.desktop.in.h:1
-#, fuzzy
-msgid "Mandrakelinux Update"
-msgstr "Mandrakestore"
-
 #: data/rpmdrake.desktop.in.h:1
 #, fuzzy
 msgid "Install Software"
diff --git a/po/lv.po b/po/lv.po
index e35dc3c4..d8ad93e5 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\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@linux-mandrake.com>\n"
@@ -59,7 +59,7 @@ msgstr "Atvienojama ierīce"
 msgid "Path or mount point:"
 msgstr "Ceļš uz montēšanas punktu:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Drošības atjauninājumi"
@@ -126,9 +126,9 @@ msgstr "Avota tips:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Atcelt"
@@ -137,10 +137,10 @@ msgstr "Atcelt"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Labi"
@@ -321,8 +321,8 @@ msgstr ""
 msgid "Command"
 msgstr "Kanāda"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(neviens)"
@@ -409,7 +409,7 @@ msgstr "Atjaunot avotus"
 msgid "Regenerate hdlist"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Lūdzu gaidiet, atjuaninu datu nesēju"
@@ -503,12 +503,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -516,571 +516,571 @@ msgid ""
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Pieejamība"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Arhivēšana"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Rezerves kopēšana"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Cd ierakstīšana"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Kompresija"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Cits"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, fuzzy, c-format
 msgid "Books"
 msgstr "Cits"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Komunikācijas"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Datubāzes"
 
 #
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Izstrāde"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr ""
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr ""
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, fuzzy, c-format
 msgid "Java"
 msgstr "Japāna"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr ""
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, fuzzy, c-format
 msgid "Editors"
 msgstr "Rediģēt"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, fuzzy, c-format
 msgid "Education"
 msgstr "Komunikācijas"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Failu rīki"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, fuzzy, c-format
 msgid "Games"
 msgstr "Cits"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Piedzīvojumi"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Arkāde"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "Laukumi"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Kārtis"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Puzļi"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Sports"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Stratēģija"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr ""
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr ""
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr ""
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Nedarīt neko"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Multimēdijas"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, fuzzy, c-format
 msgid "Networking"
 msgstr "Nedarīt neko"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, fuzzy, c-format
 msgid "Chat"
 msgstr "Ķīna"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Failu pārsūtīšana"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Interneta peidžeris"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, fuzzy, c-format
 msgid "Mail"
 msgstr "Brazīlija"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Jaunumi"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, fuzzy, c-format
 msgid "Remote access"
 msgstr "Noņemt .%s"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Ofiss"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Izdevējdarbība"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Zinātnes"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomija"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Bioloģija"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Ķīmija"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Datorzinātne"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Ģeozinātnes"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Matemātika"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Čaulas"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Skaņa"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Sistēma"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr ""
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, fuzzy, c-format
 msgid "Configuration"
 msgstr "Konfigurēt izejas kodus"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Ielāde un inicializācija"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Dzelži"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Pakotnes"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Drukāšana"
 
 #
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Izstrāde"
 
 #
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Izstrāde"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Fonti"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Konsole"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr ""
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr ""
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr ""
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr ""
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Termināļi"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Teksta rīki"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Rotaļlietas"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, fuzzy, c-format
 msgid "(Not available)"
 msgstr "(Nav pieejams)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Meklēšanas rezultāti"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Meklēšanas rezultāti (neviens)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Lūdzu gaidiet, meklēju..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, fuzzy, c-format
 msgid "Stop"
 msgstr "Stop"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Atjaunināms"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Pievienojams"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Izvēlēts"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, fuzzy, c-format
 msgid "Not selected"
 msgstr " konfliktē ar %s-%s-%s"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, fuzzy, c-format
 msgid "Rpmdrake %s"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Vairāk informācijas par pakotni..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Lūdzu izvēlieties"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Lūdzu gaidiet, veidoju pakotņu sarakstu..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Nav jauninājuma"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1091,28 +1091,28 @@ 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:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Viss"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, fuzzy, c-format
 msgid "Information on packages"
 msgstr "Vairāk informācijas par pakotni..."
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Nepieciešams noņemt dažas papildus pakotnes"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1123,19 +1123,19 @@ msgstr ""
 "ir nepieciešams noņemt arī sekojoša(s) pakotne(s):\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, fuzzy, c-format
 msgid "Some packages can't be removed"
 msgstr "Pakotni neizdodas instalēt"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, fuzzy, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1146,12 +1146,12 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Papildus nepieciešamās pakotnes"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1162,17 +1162,17 @@ msgstr ""
 "ir nepieciešams instalēt arī sekojoša(s) pakotne(s):\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, fuzzy, c-format
 msgid "Some packages can't be installed"
 msgstr "Pakotni neizdodas instalēt"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, fuzzy, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1182,132 +1182,137 @@ msgstr ""
 "Atvainojiet, sekojošas pakotnes nevar tikt izvēlētas\"\n"
 "\n"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Dažas pakotnes nepieciešams noņemt"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Izvēlēts: %d MB / brīvā diska vieta: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Izvēles apjoms: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Faili:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Izmaiņu žurnāls:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Patreiz instalētā versija: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Vārds: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Versija: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Apjoms: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Svarīgums: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Kopsavilkums: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Atjaunināšanas iemesls: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Apraksts: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Kļūdu labojumu jauninājumi"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Parasti jauninājumi"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux izvēles"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Visas pakotnes, pēc alfabēta"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, fuzzy, c-format
 msgid "All packages, by group"
 msgstr "Visas pakotnes,"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, fuzzy, c-format
 msgid "All packages, by size"
 msgstr "Visas pakotnes,"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, fuzzy, c-format
 msgid "All packages, by selection state"
 msgstr "pēc izvēlēšanās statusa"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, fuzzy, c-format
 msgid "All packages, by medium repository"
 msgstr "pēc avota repozitārija"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, fuzzy, c-format
 msgid "All packages, by update availability"
 msgstr "pēc atjauninājuma pieejamības"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
@@ -1337,7 +1342,7 @@ msgstr "Izvēlēties no jauna"
 msgid "Reload the packages list"
 msgstr "Pārlādējiet pakotņu sarakstu"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, fuzzy, c-format
 msgid "Update media"
 msgstr "Atjaunot avotus"
@@ -1736,6 +1741,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1749,158 +1759,182 @@ 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:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Programmatūras pakotņu noņemšana"
+
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux atjaunināšana"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Nē"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Jā"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Austrālija"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Beļģija"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Brazīlija"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Kanāda"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Čehija"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Vācija"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Dānija"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Grieķija"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Spānija"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Somija"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, fuzzy, c-format
 msgid "France"
 msgstr "Piespiest"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, fuzzy, c-format
 msgid "Israel"
 msgstr "Instalēt"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, fuzzy, c-format
 msgid "Italy"
 msgstr "Instalēt"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Japāna"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, fuzzy, c-format
 msgid "Korea"
 msgstr "Piespiest"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Holande"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Norvēģija"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Polija"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Portugāle"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Krievija"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Zviedrija"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Taivāna"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Apvienotā Karaliste"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Ķīna"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "ASV"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Man jākontaktējas ar Mandrakesoft web vietu, lai saņemtu\n"
+"spoguļserveru sarakstu. Lūdzu, pārliecinieties, ka Jūsu tīkls\n"
+"patreiz darbojas.\n"
+"\n"
+"Vai ir labi turpināt?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1914,19 +1948,40 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr ""
+"Lūdzu gaidiet, lujuplādēju spoguļserveru sarakstu no Mandrakesoft web vietas."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 "Lūdzu gaidiet, lujuplādēju spoguļserveru sarakstu no Mandrakesoft web vietas."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Bija kļūda lejuplādējot spoguļserveru sarakstu:\n"
+"\n"
+"%s\n"
+"Tīkls, vai arī Mandrakesoft web vieta, iespējams, nav pieejami.\n"
+"Lūdzu, mēģiniet vēlreiz vēlāk."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1941,12 +1996,17 @@ msgstr ""
 "Tīkls, vai arī Mandrakesoft web vieta, iespējams, nav pieejami.\n"
 "Lūdzu, mēģiniet vēlreiz vēlāk."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Nav spoguļservera"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1961,63 +2021,63 @@ msgstr ""
 "ka procesora arhitektūra netiek atbalstīta no Mandrakelinux\n"
 "oficiālo atjauninājumu puses."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Lūdzu izvēlieties spoguļserveri"
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, fuzzy, c-format
 msgid " failed!"
 msgstr "failos"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2028,19 +2088,19 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
 msgstr ""
 "Lūdzu izvēlieties avotus,\n"
 "kurus vēlaties atnunot:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Atjaunināt"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, fuzzy, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2049,7 +2109,7 @@ msgid ""
 "%s"
 msgstr "Nav iespējams atjaunināt datu nesēju; tas tiks automātiski atslēgts."
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2057,17 +2117,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Nevaru izveidot datu nesēju."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "Lūdzu gaidiet, pievienoju datu nesēju..."
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2075,7 +2135,15 @@ msgid ""
 "%s"
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, 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:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2343,11 +2411,6 @@ msgstr ""
 msgid "Unknown error code %d\n"
 msgstr "Nezināms kļūdas kods %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-#, fuzzy
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux atjaunināšana"
-
 #: data/rpmdrake.desktop.in.h:1
 #, fuzzy
 msgid "Install Software"
diff --git a/po/mk.po b/po/mk.po
index a940e569..2a424877 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-mk\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-09-03 20:56+0200\n"
 "Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -57,7 +57,7 @@ msgstr "Уред со менливи медиуми"
 msgid "Path or mount point:"
 msgstr "Пат или точка на монтирање:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Сигурностни ажурирања"
@@ -124,9 +124,9 @@ msgstr "Тип на медиум:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Откажи"
@@ -135,10 +135,10 @@ msgstr "Откажи"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "ОК"
@@ -319,8 +319,8 @@ msgstr "Медиумски лимит"
 msgid "Command"
 msgstr "Команда"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(нема)"
@@ -409,7 +409,7 @@ msgstr "Ажурирање на медиум"
 msgid "Regenerate hdlist"
 msgstr "Регенерирање на hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Почекајте, медиумот се ажурира..."
@@ -511,12 +511,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "Медиумот „%s“ е успешно додаден."
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "Извршување како обичен корисник"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -527,568 +527,568 @@ msgstr ""
 "Нема да можете да правите модификации на системот,\n"
 "но ќе можете да ја разгледувата постојната база на пакети."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Пристапливост"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "Архивирање"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "Бекап"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "Снимање CD"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "Компресија"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "Друго"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "Книги"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "Компјутерски книги"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "Прашања (FAQ)"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Како-да (How-to)"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "Литература"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "Кластер"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "Пренесување на пораките"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "Сервиси на чекање"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "Комуникација"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "Бази на податоци"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "Развој"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME и GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE и Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "Кернел"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "Едитори"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "Едукација"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "Емулатори"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "Фајл-алатки"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "Игри"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "Авантури"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "Аркадни"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "На табла"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "Карти"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "Гатанки"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "Спорт"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "Стратегии"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "Графички десктоп"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM-базиран"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "Графика"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "Мониторинг"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "Мултимедија"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "Мрежа"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "Муабети"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "Трансфер на фајлови"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "Инстант пораки"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "Пошта"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "Новости"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "Далечински пристап"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "Канцеларија"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "Јавни клучеви"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "Издаваштво"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "Наука"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "Астрономија"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "Биологија"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "Хемија"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "Информатика"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "Гео-науки"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "Математика"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "Физика"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Школки"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "Звук"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "Систем"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "Основни"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "Конфигурација"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "Подигање и иницијализација"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "Хардвер"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "Пакети"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "Печатење"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "Развој"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "Развивање"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "Фонтови"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "Конзола"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "Интернационализација"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Кернел и хардвер"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "Библиотеки"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "Сервери"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "Терминали"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "Текст-алатки"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "Играчки"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(Нема достапни)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "Резултати од пребарувањето"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "Резултати од пребарувањето нема"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Почекајте, пребарување..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "Може да се надградат"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "Може да се додадат"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "Селектиран"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "Неселектиран"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "Повеќе информации за пакетот..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "Изберете"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Потребен е еден од следниве пакети:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Почекајте, пакетите се подредуваат..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "Нема надградба"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1099,28 +1099,28 @@ msgstr ""
 "достапна надградба за веќе инсталираните пакети,\n"
 "или дека веќе сите надградби сте ги инсталирале."
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "Сите"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "Информации"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "Информации за пакетите"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Треба дополнително да се отстранат пакети"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1128,12 +1128,12 @@ msgid ""
 "\n"
 msgstr "Заради меѓузависностите, и следниве пакети треба да се отстранат:\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Некои од пакетите не можат да се отстранат"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1142,7 +1142,7 @@ msgstr ""
 "Жалам, но отстранувањето на овие пакети ќе го расипе системот:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1153,12 +1153,12 @@ msgstr ""
 "следниве пакети:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "Потребни се дополнителни пакети"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1169,17 +1169,17 @@ msgstr ""
 "и следниве пакети:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (припаѓа на листата за прескокнување)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Некои од пакетите не можат да бидат инсталирани"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1190,132 +1190,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Некои пакети треба да се отстранат"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Селектирани: %d MB / Празен диск-простор: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Големина на селектирани: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Не е достапен опис за овој пакет\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "Датотеки:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "Медиум: "
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "Моментално инсталирана верзија: "
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "Име: "
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "Верзија: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "Големина: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "Важност: "
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "Функција: "
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "Причина за надградба: "
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "Опис: "
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Надградби заради бубачки"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "Нормални надградби"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Изборот на пакети на Mandrakelinux"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Сите пакети, по абецеден редослед"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "Сите пакети, по група"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "Сите пакети, по големина"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Сите пакети, според селектираност"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Сите пакети, според медиум"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Сите пакети, по достапност на надградби"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Само листови, сортирани по датум на инсталирање"
@@ -1345,7 +1350,7 @@ msgstr "Ресетирање на селекцијата"
 msgid "Reload the packages list"
 msgstr "Пре-вчитување на листата пакети"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "Ажурирање на медиум"
@@ -1762,6 +1767,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1775,158 +1785,181 @@ msgstr ""
 "пакети на ЦДРОМ или ДВД. Оваа алатка ќе Ви помогне да\n"
 "инсталирате софтвер на Вашиот компјутер."
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "Ажурирање на софтверски пакети"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Надградби на Mandrakelinux"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "Не"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "Да"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "Информации..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "Австрија"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "Австралија"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "Белгија"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "Бразил"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "Коста Рика"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "Чешка"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "Германија"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "Данска"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "Грција"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "Шпанија"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "Финска"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "Франција"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "Израел"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "Италија"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "Јапонија"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "Кореја"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "Холандија"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "Норвешка"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "Полска"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "Португалија"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "Русија"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "Шведска"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "Тајван"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "Велика Британија"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "Кина"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "САД"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Треба да го контактирам веб-сајтот на Mandrakesoft за да\n"
+"ја земам листата на огледала. Проверете дали Ви работи мрежата.\n"
+"\n"
+"Да продолжиме?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1939,18 +1972,38 @@ msgstr ""
 "\n"
 "Да продолжиме?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "Почекајте, префрлање на адреси на огледала од Mandrakesoft."
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Почекајте, префрлање на адреси на огледала од Mandrakesoft."
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "Грешка при префрлање"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"Се појави грешка при префрлање на листата на огледала:\n"
+"\n"
+"%s\n"
+"Мрежата (или пак веб-сајтот на Mandrakesoft) не е достапна.\n"
+"Обидете се подоцна."
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1965,12 +2018,17 @@ msgstr ""
 "Мрежата (или пак веб-сајтот на Mandrakesoft) не е достапна.\n"
 "Обидете се подоцна."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "Нема огледало"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1985,63 +2043,63 @@ msgstr ""
 "кога архитектурата на Вашиот процесор не е поддржана од\n"
 "официјалните надградби на Мандрак Линукс."
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Изберете го саканото огледало."
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Копирање на фајл за медиумот „%s“..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Испитување на фајл од медиумот „%s“..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Испитување на далечински фајл од медиумот „%s“..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " готово"
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " неуспех!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s од медиумот %s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Почнувам со префрлање на „%s“..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Префрлање на „%s“, преостанато време:%s, брзина:%s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Префрлање на „%s“, брзина:%s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Грешка при преземање на пакетите"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2059,17 +2117,17 @@ msgstr ""
 "обидете\n"
 "подоцна."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Изберете го медиумот што сакате да го ажурирате:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "Ажурирај"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2082,7 +2140,7 @@ msgstr ""
 "Грешки:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2093,17 +2151,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "Не може да се креира медиум."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Неуспеш при додавање медиум"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2114,7 +2172,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, 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 ""
+"Вашиот медиум `%s', кој се користи за ажурирања, не се совпаѓа со верзијата "
+"на Mandrakelinux на која што работите (%s).\n"
+"Медиумот ќе биде исклучен."
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2383,10 +2452,6 @@ msgstr "Непрепознаено кодирање на трансфер\n"
 msgid "Unknown error code %d\n"
 msgstr "Непознат код за грешка: %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Надградби на Mandrakelinux"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "Инсталирање софтвер"
diff --git a/po/ms.po b/po/ms.po
index 45ca4805..e2fd0ea9 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2003-06-30 18:27+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -57,7 +57,7 @@ msgstr ""
 msgid "Path or mount point:"
 msgstr "Path atau titik mount:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "Kemaskini sekuriti"
@@ -124,9 +124,9 @@ msgstr "Jenis:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
@@ -135,10 +135,10 @@ msgstr "Batal"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -317,8 +317,8 @@ msgstr ""
 msgid "Command"
 msgstr "Arahan"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(tiada)"
@@ -407,7 +407,7 @@ msgstr "Ubah Sumber"
 msgid "Regenerate hdlist"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr "Penmeriksaan kebergantungan..."
@@ -493,12 +493,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, fuzzy, c-format
 msgid "Running in user mode"
 msgstr "dalam pengguna"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, fuzzy, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -506,568 +506,568 @@ msgid ""
 "but you may still browse the existing database."
 msgstr "normal pengguna on."
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "Kebolehcapaian"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr ""
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, fuzzy, c-format
 msgid "Backup"
 msgstr "Hitam"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr ""
 
-#: ../rpmdrake:111
author	mkanat%bugzilla.org <>	2006-07-14 04:55:43 +0000
committer	mkanat%bugzilla.org <>	2006-07-14 04:55:43 +0000
commit	7f9a841d4ceeb5b6bb1648c702c2c753b1d75a51 (patch)
tree	112e4eb1bcd323126b326da07ab34b8cf2258a28 /Bugzilla/User
parent	9f7ba4e2a5a3b7a4a22e160343b7571058736199 (diff)
download	bugs-7f9a841d4ceeb5b6bb1648c702c2c753b1d75a51.tar bugs-7f9a841d4ceeb5b6bb1648c702c2c753b1d75a51.tar.gz bugs-7f9a841d4ceeb5b6bb1648c702c2c753b1d75a51.tar.bz2 bugs-7f9a841d4ceeb5b6bb1648c702c2c753b1d75a51.tar.xz bugs-7f9a841d4ceeb5b6bb1648c702c2c753b1d75a51.zip