Updated POT file

71 files changed, 13994 insertions, 16579 deletions

diff --git a/perl-install/install/share/po/DrakX.pot b/perl-install/install/share/po/DrakX.pot
index ecdb31565..8e1d73058 100644
--- a/perl-install/install/share/po/DrakX.pot
+++ b/perl-install/install/share/po/DrakX.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,31 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -77,92 +52,92 @@ msgstr ""
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr ""
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr ""
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr ""
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -174,18 +149,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr ""
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -194,72 +169,72 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr ""
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr ""
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr ""
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr ""
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr ""
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr ""
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr ""
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr ""
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr ""
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
@@ -270,11 +245,15 @@ msgid "Installation"
 msgstr ""
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr ""
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -297,22 +276,22 @@ msgstr ""
 msgid "Bringing down the network"
 msgstr ""
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
+msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr ""
@@ -354,296 +333,278 @@ msgstr ""
 msgid "An error occurred:"
 msgstr ""
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr ""
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
 "(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr ""
@@ -655,54 +616,52 @@ msgid ""
 "applications and desktop tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr ""
@@ -792,17 +751,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr ""
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr ""
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr ""
@@ -919,12 +878,12 @@ msgstr ""
 msgid "Software Management"
 msgstr ""
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr ""
@@ -951,7 +910,7 @@ msgid_plural "%d packages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr ""
@@ -961,7 +920,7 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr ""
@@ -971,14 +930,14 @@ msgstr ""
 msgid "Media Selection"
 msgstr ""
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -987,7 +946,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1007,59 +966,49 @@ msgstr ""
 msgid "Here is the full list of available keyboards:"
 msgstr ""
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr ""
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr ""
 
-#: steps_interactive.pm:147
-#, c-format
-msgid "Upgrade %s"
-msgstr ""
-
 #: steps_interactive.pm:151
 #, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgid "Upgrade %s"
 msgstr ""
 
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr ""
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1071,24 +1020,24 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr ""
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1096,7 +1045,7 @@ msgid ""
 "DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1105,153 +1054,153 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr ""
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr ""
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr ""
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr ""
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr ""
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr ""
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr ""
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr ""
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr ""
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr ""
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr ""
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr ""
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr ""
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1264,95 +1213,95 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr ""
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr ""
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr ""
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr ""
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr ""
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr ""
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr ""
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr ""
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr ""
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr ""
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr ""
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1361,24 +1310,24 @@ msgid ""
 "root fs is: root=%s"
 msgstr ""
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr ""
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1386,7 +1335,7 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr ""
diff --git a/perl-install/install/share/po/af.po b/perl-install/install/share/po/af.po
index 03031c889..c4ee7bc60 100644
--- a/perl-install/install/share/po/af.po
+++ b/perl-install/install/share/po/af.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-af\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2005-04-21 17:33+0200\n"
 "Last-Translator: Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
 "Language-Team: Afrikaans\n"
@@ -21,31 +21,6 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -81,92 +56,92 @@ msgstr "Netwerk %s"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "Kontak Mandriva Linux se webwerf vir 'n lys van spieëlwebplekke...."
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr "Kontak Mandriva Linux se webwerf vir 'n lys van spieëlwebplekke...."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Kies 'n spieël waar die pakkette verkry kan word"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Gids"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Kan nie %s op %s vind nie"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ondersoek pakette wat reeds geïnstalleer is..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Soek vir pakkette om op te gradeer..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -178,18 +153,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Herlaai"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -202,73 +177,73 @@ msgstr ""
 "\n"
 "Wil u werklik dat ons hulle verwyder?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fout met die lees van lêer %s"
 
 #
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Die volgende pakkette geïnstalleer word:\n"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "Ftp"
 
-#: any.pm:1081
+#: any.pm:1087
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "PFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Netwerk"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Kies asseblief"
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Lêer bestaan alreeds. Moet dit gebruik word?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Toegang verbied"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr ""
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Kan nie skermfoto's neem voor partisie skep nie"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skermfoto's sal na die installasie beskikbaar wees in %s"
@@ -279,11 +254,15 @@ msgid "Installation"
 msgstr "Besig met installasie"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurasie"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -308,22 +287,22 @@ msgstr "Netwerk op pad op"
 msgid "Bringing down the network"
 msgstr "Netwerk op pad af"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Stuur lêers..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Bespeuring aan die gebeur"
@@ -365,27 +344,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "'n Fout het voorgekom"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "onsuksesvolle installasie"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Installeer pakket %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Werkstasie"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Kantoorwerkstasie"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -394,7 +373,7 @@ msgstr ""
 "Kantoorprogramme: Woordverwerkers(OpenOffice.org Writer, Kword), spreistate "
 "(OpenOffice.org Calc, Kspread), PDF-sigprogramme, ens."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -403,32 +382,32 @@ msgstr ""
 "Kantoorprogramme: Woordverwerkers( kword, abiword), spreistate (kspread, "
 "gnumeric), PDF-sigprogramme, ens."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Speletjiesrekenaar"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Vermaak: Arkade, Bordspel, Strategie ens."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediastasie"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Klank- en videospelers/redigeerders"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internetstasie"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -437,27 +416,27 @@ msgstr ""
 "Stel hulpprogramme om e-pos en netnuus te lees en te stuur (mutt, tin) en om "
 "ook die web deur te blaai."
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Netwerkrekenaar (kliënt)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Kliëntprogramme vir 'n verkeidenheid protokolle insluitend SSH"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Nutsprogramme wat u rekenaarkonfigurasie vergemaklik"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsole Hulpprogramme"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
@@ -465,185 +444,167 @@ msgstr ""
 "programme"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Ontwikkeling"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C en C++ ontwikkelingsprogrammateke, programme en insluitlêers"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentasie"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Boeke en HOWTO's oor Linux en Vrye Sagteware"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Derdeparty ondersteuning van programme"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Web-bediener"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "Groep:"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab-bediener"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Vuurmuur/Netwerkroteerder"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internetpoort"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/Lêer/_Nuut"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix e-pos-bediener"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "Herstel vanaf CD"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-bediener"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domeinnaam en Netwerk-informasie-bediener (DNS/NIS)"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Drukkerbediener"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Samba-bediener"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Databasis"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, fuzzy, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL of MySQL databasisbediener"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "e-Pos"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix e-pos-bediener"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL of MySQL databasisbediener"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Netwerkrekenaar-bediener"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS, SMB, Instaan- , SSH (Bedieners)"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafiese Omgewing"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE Werkstasie"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -652,12 +613,12 @@ msgstr ""
 "Die K-werkskermomgewing (KDE), die basiese grafiese omgewing met 'n "
 "versameling bygaande hulpprogramme"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-werkstasie"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -666,7 +627,7 @@ msgstr ""
 "'n Grafiese omgewing met  gebruikersvriendelike stel applikasies en "
 "werkskerm-hulpprogramme"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "'n Werkstasie"
@@ -680,54 +641,52 @@ msgstr ""
 "'n Grafiese omgewing met  gebruikersvriendelike stel applikasies en "
 "werkskerm-hulpprogramme"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Ander Grafiese Werkskerms"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, fuzzy, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ens."
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Nutsprogramme"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-bediener"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Webkamera"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Terminal Server Konfigurasie"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Monitor van Netwerk"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "<b>Mandriva Store</b>"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Probleme met die konfigurasie van drukker \" %s\"!"
@@ -829,17 +788,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Kies Pakketgroepe"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuele pakket-seleksie"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Totale grootte: %d / %d MB"
@@ -958,12 +917,12 @@ msgstr "Minimale installasie"
 msgid "Software Management"
 msgstr "Sagteware Beheer"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Kies die pakkette wat u wil installeer"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Besig met installasie"
@@ -990,7 +949,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pakket"
 msgstr[1] "%d pakkette"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Opsomming"
@@ -1000,7 +959,7 @@ msgstr "Opsomming"
 msgid "Configure"
 msgstr "Konfigureer"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "nie gekonfigureer nie"
@@ -1010,14 +969,14 @@ msgstr "nie gekonfigureer nie"
 msgid "Media Selection"
 msgstr "Kies Pakketgroepe"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1026,7 +985,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1046,59 +1005,49 @@ msgstr "Kies asseblief u sleutelborduitleg"
 msgid "Here is the full list of available keyboards:"
 msgstr "Hier is die volle lys van beskikbare lande"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installeer/Opgradeer"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Is hierdie 'n installasie of opgradering?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installasie"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Opgradeer %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Enkripsie-sleutel vir %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Besig met installasie"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1110,17 +1059,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE word opgestel"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1130,7 +1079,7 @@ msgstr ""
 "sal  herlaaipartisie met DiskDrake moet skep indien u die stelsel wil "
 "herlaai."
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, fuzzy, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1141,7 +1090,7 @@ msgstr ""
 "sal  herlaaipartisie met DiskDrake moet skep indien u die stelsel wil "
 "herlaai."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1155,19 +1104,19 @@ msgstr ""
 "nie\n"
 "hieroor beskik nie, druk Kanselleer om installasies vanaf dié CDROM te vermy."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Soek vir beskikbare pakkette"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1176,52 +1125,52 @@ msgstr ""
 "Kies asb. die laai of stoor pakketkeuse op die floppie.\n"
 "Die formaat is dieselfde as outoinstallasie-genereerde floppies."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Las"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Stoor"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Laai lêer"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Kies Pakketgroepe"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Geselekteerde grootte is groter as beskikbare spasie."
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipe installasie"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1230,82 +1179,82 @@ msgstr ""
 "U het glad nie 'n groep pakkette gekies nie.\n"
 "Kies asseblief die tipe minimale installasie:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Met X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Met basiese dokumentasie (word aanbeveel!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Absolute minimale installasie (geen urpmi!)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Berei installasie voor"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Installeer pakket %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Daar was 'n fout met pakkette:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Gaan steeds voort?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Stoor pakketseleksie"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Daar was 'n fout met die installasie van die pakkette:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Post-installasiekonfigurasie"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr ""
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1325,96 +1274,96 @@ msgstr ""
 "\n"
 "Wil u dit nou installeer?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s op %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Hardeware"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Klankkaart"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Beskik u oor 'n ISA klankkaart?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, fuzzy, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "Loop \"sndconfig\" na die installasie om u klankkaart te konfigureer"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Geen klankkaart opgespoor nie. Probeer \"harddrake\" na die installasie"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafiese-koppelvlak"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Netwerk & Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Instaan bedieners"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "gekonfigureer"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Sekuriteitsvlak"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Vuurmuur"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "ge-aktiveer"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "ge-deaktiveer"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "U het nog nie 'X' opgestel nie. Verlang u dit regtig?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Herlaaistelsel word voorberei..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, fuzzy, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1427,7 +1376,7 @@ msgstr ""
 "Ons sal voortgaan met die installasie, maar u sal\n"
 "BootX of 'n ander manier moet gedruik om u rekenaar te selflaai"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1436,17 +1385,17 @@ msgstr ""
 "Met hierdie sekuriteitsvlak word toegang na lêers op die Windows partisie "
 "vernou na slegs die administrateur"
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sit 'n leë floppie in aandrywer %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Outoinstallasieskyf word geskep."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1457,7 +1406,7 @@ msgstr ""
 "\n"
 "Wil u werklik nou eindig?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Geluk"
@@ -1601,6 +1550,10 @@ msgid ""
 "Exit"
 msgstr "Verlaat"
 
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Stuur lêers..."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/am.po b/perl-install/install/share/po/am.po
index 0eb672a81..1931181b0 100644
--- a/perl-install/install/share/po/am.po
+++ b/perl-install/install/share/po/am.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2004-06-01 03:36+0100\n"
 "Last-Translator: Alemayehu <alemayehu@gmx.at>\n"
 "Language-Team: Amharic <am-translate@geez.org>\n"
@@ -14,31 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -74,92 +49,92 @@ msgstr "መረብ"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr ""
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "ዶሴ"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -171,18 +146,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "እንደገና ጀምር"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -191,72 +166,72 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "%sን በማንበብ ላይ ስህተት ተፈጥሯል"
 
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "የሚከተሉት ጥቅሎች ሊወገዱ ነው"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "መረብ"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "እባክዎ ያለ ሰነድን ይምረጡ"
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "ፋይሉ በፊትም ነበር። ልጠቀምበት?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "ፈቃድ አልተሰጠም"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "ፋይል ተጭኗል %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr ""
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
@@ -267,11 +242,15 @@ msgid "Installation"
 msgstr "በመትከል ላይ"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "ስየማ"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -294,22 +273,22 @@ msgstr "መረቡን በማቀራረብ ላይ"
 msgid "Bringing down the network"
 msgstr "መረቡን በማለያየት ላይ"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "የቅርብ ጊዜ ፋይሎች"
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "የተሻሻለ ዊድጌት ፍጠር"
@@ -351,296 +330,278 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "ስህተት ተፈጥሯል"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "%s አልተገኘም"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "የ%s ጥቅል በመትከል ላይ"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "የቅርብ መረብ ምርጫ"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
 "(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "የመገናኛ ብዙሃን"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "ፈጣን መልእክት"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "ኮምፒውተር ሳይንስ"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, fuzzy, c-format
 msgid "Console Tools"
 msgstr "የፋይል መሳሪያዎች"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "እድገት"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "ማስረጃ"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "የመረብ ሰርቨር"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, fuzzy, c-format
 msgid "Apache"
 msgstr "መተላለፊያ"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "የውይይት መድረክ"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, fuzzy, c-format
 msgid "Kolab Server"
 msgstr "የሳምባ ተጠሪ"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "አዲስ ፋይል።"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "የመልዕክት ተጠሪ ሚስጢራዊ ቃል ያስፈልጋል"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "በዝርዝር ውስጥ ዶሴ ጨምር"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "የFTP ተጠሪ"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "የዘርፍ ስም ሰርቨር"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "የማተሚያ ሰርቨር"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "የሳምባ ሰርቨር"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "ዳታቤዝ"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "ፖስታ"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "ኮምፒውተር ሳይንስ"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "ሰሌዳ"
@@ -652,54 +613,52 @@ msgid ""
 "applications and desktop tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, fuzzy, c-format
 msgid "Utilities"
 msgstr "ፊሊፒንስ"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "ስለተጠሪ መረጃ"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "ዌብ-ካም"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "ቀዳሚ ተጠሪ ይጠቀም"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Name=መረብ"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "<b>የMandriva Linux ባለሞያ</b>"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "የባሕር-መዝገብ እሴት '%s' ወደ '%s' እንደገና መሰየም አልተቻለም።"
@@ -789,17 +748,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "የጥቅል ቡድን ምርጫ"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "የነጠላ ጥቅል ምርጫ"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "አጠቃላይ መጠን: %d / %d MB"
@@ -916,12 +875,12 @@ msgstr "አነስተኛ ተከላ"
 msgid "Software Management"
 msgstr ""
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "ለመትከል የሚፈልጉትን ጥቅል ይምረጡ"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "በመትከል ላይ"
@@ -948,7 +907,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d ጥቅሎች"
 msgstr[1] "%d ጥቅሎች"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "ማጠቃለያ"
@@ -958,7 +917,7 @@ msgstr "ማጠቃለያ"
 msgid "Configure"
 msgstr "ለውጥ"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "አልተስተካከለም"
@@ -968,14 +927,14 @@ msgstr "አልተስተካከለም"
 msgid "Media Selection"
 msgstr "የጥቅል ቡድን ምርጫ"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -984,7 +943,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1004,59 +963,49 @@ msgstr ""
 msgid "Here is the full list of available keyboards:"
 msgstr ""
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "ትከል/አሳድግ"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "ትከል"
 
-#: steps_interactive.pm:147
-#, c-format
-msgid "Upgrade %s"
-msgstr ""
-
 #: steps_interactive.pm:151
 #, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgid "Upgrade %s"
 msgstr ""
 
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "የ%s ሚስጢራዊ መገልበጫ ቁልፍ"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "በመትከል ላይ"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1068,24 +1017,24 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDEን በማስተካከል ላይ"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1093,7 +1042,7 @@ msgid ""
 "DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1102,153 +1051,153 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr ""
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "ጫን"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "አስቀምጥ"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "1 ፋይል"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "ኖም"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "የጥቅል ቡድን ምርጫ"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "የተከላው አይነት"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "በX"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "ተከላ በማዘጋጀት ላይ"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "የ%s ጥቅል በመትከል ላይ"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "ለማንኛውም ቀጥል?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "የጥቅሎችን ምርጫ አስቀምጥ"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "የ%s ጥቅል በመትከል ላይ"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Post-install configuration"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "አሻሻዎች"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1261,95 +1210,95 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s %s ላይ ነው"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "ሀርድዌር"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "የድምፅ ካርድ"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "የISA ድምጽ ካርድ አለዎት?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "ንድፋዊ እይታ"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "መረብ እና ኢንተርኔት"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "ወኪሎች"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "ተስተካክሏል"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "የደህንነት ደረጃ"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "የእሳት ግድግዳ"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "መስራት ጀምሯል"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "መስራት አቁሟል"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "አስጀማሪ በማዘጋጀት ላይ..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1358,24 +1307,24 @@ msgid ""
 "root fs is: root=%s"
 msgstr ""
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr ""
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1383,7 +1332,7 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "እንኳን ደስ ያለዎ!"
@@ -1528,6 +1477,10 @@ msgid ""
 msgstr "ውጣ"
 
 #, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "የቅርብ ጊዜ ፋይሎች"
+
+#, fuzzy
 #~ msgid "IceWm Desktop"
 #~ msgstr "ሰሌዳ"
 
diff --git a/perl-install/install/share/po/ar.po b/perl-install/install/share/po/ar.po
index 4a6a4feef..495b2630d 100644
--- a/perl-install/install/share/po/ar.po
+++ b/perl-install/install/share/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-03-25 19:22+0400\n"
 "Last-Translator: Yaser Ammar <linux.uae@gawab.com>\n"
 "Language-Team:  Arabic <doc@arabeyes.org>\n"
@@ -22,31 +22,6 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "سطح مكتبك على وحدة USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "توزيعة لينكس ماندريفا مفتوحة المصدر 100%%"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "اكتشف لينكس بسهولة مع ماندريفا ون"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "سطح مكتب لينكس ماندريفا كامل مع الدعم"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "ماندريفا: توزيعات تلبي احتياجات الجميع"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -86,93 +61,93 @@ msgstr "الشبكة (FTP)"
 msgid "Network (NFS)"
 msgstr "الشبكة (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "مسار المرآة؟"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "يجب أن يبدأ المسار بـ http:// أو بـ ftp://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "يجري الاتصال بموقع لينكس ماندريفا للحصول على قائمة بالمرايا المتوفرة..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr "فشل الاتصال بموقع لينكس ماندريفا للحصول على قائمة بالمرايا المتوفرة"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "اختر مرآة لتحصيل الحزم"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "تثبيت NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "فضلا أدخل اسم المضيف والدليل لوسائط NFS"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "اسم المضيف غير موجود"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "يجب أن يبدأ الدليل بـ \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "اسم مضيف نقطة وصل NFS ؟"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "الدليل"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "إضافي"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "لم يمكن العثور على ملف لائحة الحزم على هذه المرآة. تأكد من صحة الموقع."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "التعرف على الحزم المثبتة مسبقاً..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "البحث عن حزم لترقيتها..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "إزالة الحزم قبيل ترقيتها"
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -189,18 +164,18 @@ msgstr ""
 " إن أردت الترقية مع إبقاء كِدي 3.5 والاحتفاظ بإعداداتك الشخصية\n"
 " فقم بإعادة الحاسوب والترقية باستخدام بريمج تحديث ماندريفا."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "إعادة الحاسوب"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -213,72 +188,72 @@ msgstr ""
 "\n"
 "هل تريد حذف هذه الحزم فعلاً؟\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "خطأ في قراءة الملف %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "لقد غُيّرت أسماء الأقراص التّالية:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (المسمّى %s سابقاً)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "الشبكة"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "فضلا.. اختر أحد الوسائط"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "الملف موجود مسبقاً. هل تريد الكتابة عليه؟"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "الإذن مرفوض"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "اسم NFS غير صالح"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "الوسيط %s سيء"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "لا يمكن عمل لقطات للشاشة قبل التجزئة"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "ستكون لقطات الشاشة موجودة بعد التثبيت في %s"
@@ -289,11 +264,15 @@ msgid "Installation"
 msgstr "التثبيت"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "الضبط"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -318,22 +297,22 @@ msgstr "يجري تشغيل الشبكة"
 msgid "Bringing down the network"
 msgstr "يجري إغلاق الشبكة"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "انتظر رجاءً، يجري جلب الملف"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "يجري تنزيل الملف %s ..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "نسخ بعض الحزم إلى الأقراص لاستخدامها مستقبلاً"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "يجري النسخ"
@@ -377,27 +356,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "حدث خطأ"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr ""
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "تثبيت الحزمة %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "محطة عمل"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "محطّة عمل مكتبية"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -406,7 +385,7 @@ msgstr ""
 "برامج مكتبية: معالجات كلمات (OpenOffice.org Writer، Kword)، جداول ممتدة "
 "(OpenOffice.org Calc، Kspread)، برامج عرض pdf، إلخ"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -415,32 +394,32 @@ msgstr ""
 "برامج مكتبية: معالجات كلمات (kword، abiword)، جداول ممتدة (kspread، gnumeric)"
 "، برامج عرض pdf، إلخ"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "محطّة ألعاب"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "برامج تسلية: ألعاب فيديو، ألعاب لوحات، ألعاب استراتيجية، إلخ"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "محطة وسائط متعدّدة"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "برامج تحرير/تشغيل فيديو وصوتيات"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "محطّة إنترنت"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -448,211 +427,193 @@ msgid ""
 msgstr ""
 "مجموعة أدوات لقراءة وإرسال البريد والأخبار (mutt، tin..) ولتصفح الإنترنت"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "جهاز شبكة (عميل)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "عملاء لبروتوكولات مختلفة بما فيها ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "أدوات لتسهيل ضبط حاسوبك"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "أدوات الطرفيّات"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "محررات نصوص، صَدَفات، أدوات ملفات، طرفيات"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "تطوير"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "برامج ومكتبات تطوير C و C++ وملفات مضمنة"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "توثيق"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "كتب ودلائل إرشادية حول لينكس والبرامج الحرة"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "القاعدة القياسيّة للينكس (LSB). دعم تطبيقات الطرف الثالث"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "خادم وب"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "برامج مجموعات"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "خادم Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "جدار ناري/موجِّه"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "بوابة إنترنت"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "بريد/أخبار"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "خادم بريد Postfix، خادم أخبار Inn"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "خادم مجلّدات"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "خادم FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "خادم أسماء نطاقات ومعلومات شبكة"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "خادم مشاركة ملفّات وطابعات"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "خادم NFS، خادم Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "قواعد بيانات"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "خادم قواعد بيانات PostgreSQL و MySQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "وب/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache، Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "البريد"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "خادم بريد Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "خادم قواعد بيانات PostgreSQL أو MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "خادم شبكات"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "خادم NFS، خادم SMB، خادم وسيط، خادم ssh"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "بيئات رسومية"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "محطّة عمل كِدي"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -660,12 +621,12 @@ msgid ""
 msgstr ""
 "بيئة سطح مكتب كِدي؛ البيئة الرسومية الأساسية مع مجموعة من الأدوات المصاحبة"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "محطّة عمل جنوم"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -674,7 +635,7 @@ msgstr ""
 "بيئة رسومية مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة للمستخدمين "
 "العاديين"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "سطح مكتب كِدي"
@@ -688,54 +649,52 @@ msgstr ""
 "بيئة رسومية مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة للمستخدمين "
 "العاديين"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "أسطح مكتب رسومية أخرى"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm، Window Maker، Enlightenment، Fvwm، إلخ"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "وسائل"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "خادم SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "خادم الضبط البعيد Webmin"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "وسائل الشبكة/المراقبة"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "أدوات مراقبة، محاسبة عمليّات، tcpdump، nmap، ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "مرشدو ماندريفا"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "مرشدو ضبط الخادم"
@@ -833,17 +792,17 @@ msgstr "هذه معاينة لشكل سطح مكتب %s"
 msgid "Click on images in order to see a bigger preview"
 msgstr "اضغط على الصور لكي تراها كبيرة"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "انتقاء مجموعات الحزم"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "انتقاء مفرد للحزم"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "الحجم الإجمالي: %d / %d م.ب"
@@ -960,12 +919,12 @@ msgstr "تثبيت مصغّر"
 msgid "Software Management"
 msgstr "إدارة البرامج"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "اختر الحزم التي تريد تثبيتها"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "التثبيت"
@@ -996,7 +955,7 @@ msgstr[3] "%d حزم"
 msgstr[4] "%d حزمة"
 msgstr[5] "%d حزمة"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "ملخص"
@@ -1006,7 +965,7 @@ msgstr "ملخص"
 msgid "Configure"
 msgstr "اضبط"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "غير مضبوط"
@@ -1016,7 +975,7 @@ msgstr "غير مضبوط"
 msgid "Media Selection"
 msgstr "انتقاء الوسائط"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1025,7 +984,7 @@ msgstr ""
 "عُثر على وسائط التثبيت التالية.\n"
 "إن كنت تريد تخطي بعضها، فيمكنك إلغاء انتقائها الآن."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1036,7 +995,7 @@ msgstr ""
 "لديك الخيار بنسخ محتويات الأقراص المدمجة إلى قرصك الصلب قبل التثبيت.\n"
 "حيئذ، سيكمل التثبيت من القرص الصلب وستبقى الحزم متوفرة حتى يثبت النظام كاملاً."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "نسخ الأقراص كاملة"
@@ -1056,59 +1015,49 @@ msgstr "اختر تخطيط لوحة مفاتيحك رجاء"
 msgid "Here is the full list of available keyboards:"
 msgstr "هذه القائمة الكاملة لكلّ لوحات المفاتيح المتاحة:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "تثبيت/ترقية"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "هل هذا تثبيت أم ترقية؟"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "تثبيت"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "ترقية %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "الترقية من توزيعة 32 بت إلى 64 بت غير مدعومة"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "الترقية من توزيعة 64 بت إلى 32 بت غير مدعومة"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "مفتاح التعمية لـ %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "إلغاء التثبيت، وإعادة النظام"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "تثبيت جديد"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "ترقية تثبيت سابق (غير مستحسن)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1126,17 +1075,17 @@ msgstr ""
 " \n"
 " تحذير: ينبغي أن تنسخ جميع بياناتك الشخصية احتياطًا قبل اختيار\"تثبيت جديد\""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "ضبط IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1145,7 +1094,7 @@ msgstr ""
 "ليس هناك مساحة حرّة لواحد ميجابات من نظام الإقلاع! سوف يستمرّ التّثبيت، لكن "
 "لإقلاع نظامك، سوف تحتاج لإنشاء قسم لنظام الإقلاع في DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1155,7 +1104,7 @@ msgstr ""
 "تحتاج إلى إنشاء نظام إقلاع PPC PReP Boot! ستكمل عملية التثبيت، ولكن لإقلاع "
 "نظامك، أنت بحاجة إلى إنشاء لنظام الإقلاع من خلال DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1167,19 +1116,19 @@ msgstr ""
 "من فضلك أدخل القرص المسّمى \"%s\" في الّسواقة واضغط على موافق عندما تنتهي.\n"
 "إن لم يكن القرص لديك، اضغط على إلغاء لتجّنب التثبيت من هذا القرص."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "البحث عن الحزم المتاحة..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr "لا توجد مساحة كافية في نظامك للتثبيت أو الترقية (%d > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1188,52 +1137,52 @@ msgstr ""
 "اختر حفظ أو تحميل انتقائك للحزم رجاء.\n"
 "النسق مشابه لملفات التثبيت الآلي المولّدة."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "حمِّل"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "احفظ"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "ملف فاسد"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "كِدي"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "جنوم"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "انتقاء سطح المكتب"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "بإمكانك اختيار لاحة سطح محطة العمل هذه"
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "الحجم المختار أكبر من المساحة المتاحة"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "نوع التثبيت"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1242,82 +1191,82 @@ msgstr ""
 "لم تختر أي مجموعة من الحزم.\n"
 "رجاء اختر حد التثبيت الأدنى الذي تريده:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "مع X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "مع وثائق المساعدة الأساسية (مفضّل)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "حد التثبيت الأدنى الحقيقي (دون urpmi خصوصًا)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "التثبيت يُحضَّر"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "تثبيت الحزمة %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "كان هناك خطأ في ترتيب الحزم:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "هل تريد المتابعة على أية حال؟"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "أعد المحاولة"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "تخطّ هذه الحزمة"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "تخطّ جميع الحزم من الوسيط \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "ارجع إلى الوسائط وانتقاء الحزم"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "كان هناك خطأ في تثبيت الحزمة %s"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "ضبط ما بعد التثبيت"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "تأكد رجاء من وجود وسائط وحدات التحديث في محرك الأقراص %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "التحديثات"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1338,95 +1287,95 @@ msgstr ""
 "\n"
 "هل تريد تثبيت هذه التحديثات؟"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s على %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "العتاد"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "بطاقة الصوت"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "هل لديك بطاقة صوت ISA؟"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "شغّل \"alsaconf\" أو \"sndconfig\" بعد التّثبيت لضبط بطاقة الصّوت"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "لم يُعثر على بطاقة صوت. حاول تشغيل \"harddrake\" بعد التثبيت"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "الواجهة الرسومية"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "الشبكة والإنترنت"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "الخوادم الوسيطة"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "مضبوط"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "مستوى الأمن"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "جدار ناري"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "مُنشّط"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "مُعطّل"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "لم تقم بضبط خادم س (X). هل أنت متأكد أنك تريد ذلك؟"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "محمّل الإقلاع يُحضَّر..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1438,7 +1387,7 @@ msgstr ""
 "نظامك. ستكمل عملية التثبيت، ولكنك بحاجة إلى استخدام BootX أو طريقة ما أخرى "
 "لإقلاع نظامك. مُعطى النواة لنظام الملفات الجذر هو: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1447,17 +1396,17 @@ msgstr ""
 "في هذا المستوى الأمني، الوصول إلى الملفّات في قسم وندوز سيكون مقصوراً على "
 "المدير."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "أدخل قرصًا مرنًا فارغًا في محرك الأقراص %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "إنشاء قرص مرن للتثبيت الآلي..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1468,7 +1417,7 @@ msgstr ""
 "\n"
 "هل تريد الخروج الآن حقاً؟"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "تهانينا"
@@ -1612,6 +1561,30 @@ msgid ""
 "Exit"
 msgstr "اخرج"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "سطح مكتبك على وحدة USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "توزيعة لينكس ماندريفا مفتوحة المصدر 100%%"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "اكتشف لينكس بسهولة مع ماندريفا ون"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "سطح مكتب لينكس ماندريفا كامل مع الدعم"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "ماندريفا: توزيعات تلبي احتياجات الجميع"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "يجري تنزيل الملف %s ..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "الترقية من توزيعة 32 بت إلى 64 بت غير مدعومة"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "الترقية من توزيعة 64 بت إلى 32 بت غير مدعومة"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/az.po b/perl-install/install/share/po/az.po
index 0788af952..76b97d09a 100644
--- a/perl-install/install/share/po/az.po
+++ b/perl-install/install/share/po/az.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2005-03-31 14:21+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -20,31 +20,6 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -80,17 +55,17 @@ msgstr "Şəbəkə %s"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -98,7 +73,7 @@ msgstr ""
 "Mövcud əkslərin siyahısını almaq üçün Mandriva Linux səhifəsi ilə təmas "
 "qurulur..."
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -107,69 +82,69 @@ msgstr ""
 "Mövcud əkslərin siyahısını almaq üçün Mandriva Linux səhifəsi ilə təmas "
 "qurulur..."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Paketleri almaq üçün bir əks ünvanı seçin"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Qovluq"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "%s, %s üstündə tapıla bilmir"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Qurulu olan paketlər yoxlanır..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Güncəllənəcək paketlar tapılır"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -181,18 +156,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Yenidən başlat"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -205,72 +180,72 @@ msgstr ""
 "\n"
 "Bu paketləri həqiqətən də silmək istəyirsiniz?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s faylı oxunurkan xəta oldu"
 
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Aşağıdakı paketlər qurulmalıdır:\n"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Şəbəkə"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Xahiş edirik seçin"
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fayl onsuz da mövcuddur. Üstünə yazım?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Səlahiyyət yoxdur"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "%s medyası əlavə edildi"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Bölmələmədən əvvəl görüntü alına bilməz"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ekran görüntüləri qurulumdan sonra %s mövqeyində olacaqdır"
@@ -281,11 +256,15 @@ msgid "Installation"
 msgstr "Qurulur"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Quraşdırma"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -311,22 +290,22 @@ msgstr "Şəbəkə fəallaşdırılır"
 msgid "Bringing down the network"
 msgstr "Şəbəkə dayandırılır"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Fayllar göndərilir..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Təsbit etmə fəaliyyətdədir"
@@ -368,27 +347,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Bir xəta oldu"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Qurulum bacarılmadı"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "%s paketi qurulur"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "İş Stansiyası"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Ofis İş Stansiyası"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -397,7 +376,7 @@ msgstr ""
 "İdarə proqramları: kəlmə işləyənlər (OpenOffice.org Writer, Kword), "
 "hesablayıcılar və pdf göstəriciləri, vs."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -406,32 +385,32 @@ msgstr ""
 "İdarə proqramları: kəlmə işləyənlər (kword, abiword), hesablayıcılar və pdf "
 "göstəriciləri, vs."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Oyun stansiyası"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Məzəli proqramlar: arkad, lövhə oyunları, strategiya, vs"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedya stansiyası"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Səs və video çalınması/düzəliş proqramları"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "İnternet stansiyası"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -440,223 +419,205 @@ msgstr ""
 "Elektronik məktub və xəbər oxuyucu vasitələr dəstəsi (pine, mutt, tin..) və "
 "Veb səyyahları"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Şəbəkə Kompüteri (alıcı)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "SSH daxil bir çox protokolların alıcıları"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Kompüter qurğularını asandlaşdıran vasitələr"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsol Vasitələri"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editorlar, rəflər, fayl vasitələri, terminallar"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "İnkişaf"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C və C++ inkişaf kitabxanaları, proqramları və daxil ediləcək fayllar"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Sənədlər"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linuks və sərbəst proqram tə'minatı haqqında Kitablar və Howtolar"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standartları Bazası. Üçüncü partiya tə'minat dəstəyi"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Veb Vericisi"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "Qrup"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Vericisi"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Atəş Divarı/İstiqamətləndirici"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "İnternet keçidi"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/Fayl/_Təze"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix poçt vericisi"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "CD'dən Geri Yüklə"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "FTP Server"
 msgstr "NTP Verici"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "DNS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domen Adı Vericisi"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Çapçı Vericisi"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Samba vericisi"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Mə'lumat Bazası"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, fuzzy, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL ya da MySQL mə'lumat bazası vericisi"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Veb/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Poçt"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix poçt vericisi"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL ya da MySQL mə'lumat bazası vericisi"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Şəbəkə Kompüter vericisi"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS vericisi, SMB vericisi, Vəkil vericisi, SSH verici"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Qrafiki Mühit"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE iş stansiyası"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE, əsas qrafiki ara üz və yardımçi proqramlar kolleksiyası"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME iş stansiyası"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -664,7 +625,7 @@ msgid ""
 msgstr ""
 "İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Masa üstü"
@@ -677,54 +638,52 @@ msgid ""
 msgstr ""
 "İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Başqa qrafiki ara üzlər"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, fuzzy, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, vs."
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Vasitələr"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Vericisi"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Veb kamerası"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Terminal Server Quraşdırılması"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Şəbəkə İzlənməsi"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "<b>Mandriva Store</b>"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "\"%s\" çapçısı quraşdırıla bilmədi!"
@@ -825,17 +784,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Paket Qruplarının Seçimi"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Fərdi paket seçimi"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Ümumi böyüklük: %d / %d Mb"
@@ -952,12 +911,12 @@ msgstr "Minimal qurulum"
 msgid "Software Management"
 msgstr "Proqram Tə'minatı İdarəsi"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Qurmaq istədiyiniz paketləri seçin"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Qurulur"
@@ -983,7 +942,7 @@ msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d paket"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "İcmal"
@@ -993,7 +952,7 @@ msgstr "İcmal"
 msgid "Configure"
 msgstr "Qur"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "quraşdırılmayıb"
@@ -1003,14 +962,14 @@ msgstr "quraşdırılmayıb"
 msgid "Media Selection"
 msgstr "Paket Qruplarının Seçimi"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1019,7 +978,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1039,59 +998,49 @@ msgstr "Xahiş edirik, klaviatura düzülüşünüzü seçin"
 msgid "Here is the full list of available keyboards:"
 msgstr "Bütün mövcud ölkələrinn siyahısı"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Qurulum/Yeniləmə"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Bu bir qurulum, yoxsa yeniləmədir?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Qur"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s-i yenilə"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s üçün şifrələmə açarı"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Qurulur"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1103,17 +1052,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "İDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "İDE qapıları qurulur"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1122,7 +1071,7 @@ msgstr ""
 "1 MB bootstrap üçün yer yoxdur! Qurulum davam edəcək, ancaq sisteminizi aça "
 "bilmək üçün DiskDrake'də bootstrap bölməsi yaratmalısınız."
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, fuzzy, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1132,7 +1081,7 @@ msgstr ""
 "1 MB bootstrap üçün yer yoxdur! Qurulum davam edəcək, ancaq sisteminizi aça "
 "bilmək üçün DiskDrake'də bootstrap bölməsi yaratmalısınız."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, fuzzy, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1147,19 +1096,19 @@ msgstr ""
 "Əgər CD-ROM əlinizdə deyilsə, bu CD-Rom'dan qurmamaq üçün Ləğv Et düyməsinə "
 "basın."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Mövcud olan paketlər axtarılır."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1168,52 +1117,52 @@ msgstr ""
 "Xahiş edirik, paket seçkilərini disketə qeyd et/disketdən yüklə\n"
 "seçənəyini seçin."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Yüklə"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Qeyd Et"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Səhv fayl"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "İDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Paket Qruplarının Seçimi"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Seçili böyüklük var olandan daha böyükdür"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Qurulum növü"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1222,82 +1171,82 @@ msgstr ""
 "Heç bir paket qrupunu seçmədiniz.\n"
 "Xahiş edirik, istədiyiniz ən kiçik qurulumu seçin:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X ilə"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Əsas sənədlərlə birlikdə (məsləhət edilən!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Həqiqətən minimal qurulum (xüsusilə urpmi olmasın)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Qurulum hazırlanır"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "%s paketi qurulur"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Paketləri istərkən xəta yarandı:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Yenə də davam edək?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Paket seçkilərini qeyd et"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Paketlər qurulurkən bir xəta oldu:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Qurulum sonrası qurğular"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Yeniləmələr"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1319,28 +1268,28 @@ msgstr ""
 "\n"
 "Yeniləmələri qurmaq istəyirsiniz ?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s üstündə %1$s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Avadanlıq"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Səs kartı"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Heç İSA səs kartınız var?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, fuzzy, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1348,67 +1297,67 @@ msgid ""
 msgstr ""
 "Qurulumdan sonra səs kartınızı qurğulamaq üçün \"sndconfig\" əmrini icra edin"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Səs kartı tapılmadı. Qurulumdan sonra \"harddrake\"ni işə salın"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Qrafiki ara üz"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Şəbəkə və İnternet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Vəkil vericiləri"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "quraşdırılıb"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Təhlükəsizlik Səviyyəsi"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Atəş Divarı"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "fəal"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "qeyri-fəal"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Siz X-i quraşdırmadınız. Bundan əminsinizmi?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Açılış yükləyici hazırlanır"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, fuzzy, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1421,24 +1370,24 @@ msgstr ""
 "Qurulum davam edəcək ancaq kompüterinizi aça bilmək üçün\n"
 " BootX ya da başqa vasitədən istifadə etməlisiniz"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s sürücüsünə boş bir disket yerləşdirin"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Avtomatik qurulum disketi hazırlanır"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1449,7 +1398,7 @@ msgstr ""
 "\n"
 "Həqiqətən də çıxmaq istəyirsiniz?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Təbriklər"
@@ -1593,6 +1542,10 @@ msgid ""
 "Exit"
 msgstr "Çıxış"
 
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Fayllar göndərilir..."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/be.po b/perl-install/install/share/po/be.po
index 9d23f78b5..084735b7d 100644
--- a/perl-install/install/share/po/be.po
+++ b/perl-install/install/share/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2000-09-24 12:30 +0100\n"
 "Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
 "Language-Team: be\n"
@@ -14,31 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -74,92 +49,92 @@ msgstr "Сетка"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, fuzzy, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Выбар люстра для атрымання пакетаў"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Каталёг"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Не знойздены праграмы\n"
 
-#: any.pm:328
+#: any.pm:334
 #, fuzzy, c-format
 msgid "Looking at packages already installed..."
 msgstr "Вы не можаце адмяніць вылучэнне гэтага пакету. Ён ужо ўсталяваны"
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Пошук пакетаў для абнаўлення"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -171,18 +146,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Перазагрузка"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -191,72 +166,72 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Памылка чытання файлу %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Наступныя пакеты будуць даданы да сістэмы"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "ФС"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Сетка"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Калі ласка выбярыце відарыс відэа"
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Файл ужо йснуе. Перапісаць?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Адмоўлена ў доступе"
 
-#: any.pm:1172
+#: any.pm:1178
 #, fuzzy, c-format
 msgid "Bad NFS name"
 msgstr "Бяз назвы"
 
-#: any.pm:1193
+#: any.pm:1199
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "Загружаецца файл %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, fuzzy, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Дадаць раздзел немагчыма"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
@@ -267,11 +242,15 @@ msgid "Installation"
 msgstr "Усталёўваем"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Канфігурацыя"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -296,22 +275,22 @@ msgstr "Далучэнне да сеткі"
 msgid "Bringing down the network"
 msgstr "Адлучэнне ад сеткі"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Вызначэнне прыладаў..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Стварэньне меню ўжо запушчана"
@@ -353,27 +332,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Адбылася памылка"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Усталяванне SILO"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Усталяванне пакету %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "Канфігурацыя"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, fuzzy, c-format
 msgid "Office Workstation"
 msgstr "Працоўныя мейсцы"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -382,7 +361,7 @@ msgstr ""
 "Офісныя праграмы: працэсары словаў (OpenOffice.org Writer, Kword), "
 "электроныя табліцы, аглядальнікі pdf-файлаў, і г.д."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -391,243 +370,225 @@ msgstr ""
 "Офісныя праграмы: працэсары словаў (kword, abiword), электроныя табліцы, "
 "аглядальнікі pdf-файлаў, і г.д."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, fuzzy, c-format
 msgid "Game station"
 msgstr "Аўтэнтыфікацыя"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Забаўляльныя праграмы: аркады, стратэгіі і г.д."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Мульцімедыя"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Рэдактары і прайгравальнікі гуку і відэа"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "Інтэрнэт"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Сеткавы прынтэр (TCP/Socket)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ці жадаеце пратэсціраваць настройкі?"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Кансольныя інструментальныя сродкі"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Рэдактары, абалонкі, тэрміналы"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Распрацоўка"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Бібліятэкі і праграмы для распрацоўкі на С і С++"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Дакумэнтацыя"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "нігі і Howto па Linux і Free Software"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, fuzzy, c-format
 msgid "Web Server"
 msgstr "Сервак"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, fuzzy, c-format
 msgid "Apache"
 msgstr "Шлях:"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "Групы"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, fuzzy, c-format
 msgid "Kolab Server"
 msgstr "NIS сэервер:"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, fuzzy, c-format
 msgid "Firewall/Router"
 msgstr "Рэстарт"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, fuzzy, c-format
 msgid "Internet gateway"
 msgstr "Інтэрнэт"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/Файл/_Стварыць"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "Каталог %s Так"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "FTP Server"
 msgstr "NIS сэервер:"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Імя дамену"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Сервер друку"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "X сэервер"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "База даньняў"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Пошта"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "Сеткавыя інтэрфэйсы"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, fuzzy, c-format
 msgid "Graphical Environment"
 msgstr "Абалонка"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "Канфігурацыя"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -636,12 +597,12 @@ msgstr ""
 "The K Desktop Environment - асноўнае графічнае асяродзе з калекцыяй "
 "інструментальных сродкаў"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "Інфармацыя аб памяці"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -650,7 +611,7 @@ msgstr ""
 "Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і  "
 "інструментальных сродкаў"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Працоўны стол"
@@ -664,54 +625,52 @@ msgstr ""
 "Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і  "
 "інструментальных сродкаў"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Іншыя графічныя Працоўныя сталы"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Карыснасьці"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "NIS сэервер:"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Прылады"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Сістэмнае адміністраваньне"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Канфігурацыя сеткі"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "Цэнтар кіраваньня"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Немагчыма выдаліць \"%s\": %s."
@@ -811,17 +770,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Выбар групы пакетаў"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Асабісты выбар пакетаў"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Агульны памер: %d / %d Мб"
@@ -939,12 +898,12 @@ msgstr "Ахоўнік экрану"
 msgid "Software Management"
 msgstr "Мэнэджэр сэрвісаў"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Выбар пакетаў для ўсталявання"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Усталёўваем"
@@ -971,7 +930,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d пакетаў"
 msgstr[1] "%d пакетаў"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Агульныя зьвесткі"
@@ -981,7 +940,7 @@ msgstr "Агульныя зьвесткі"
 msgid "Configure"
 msgstr "Настройка"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "Настроіць панэль"
@@ -991,14 +950,14 @@ msgstr "Настроіць панэль"
 msgid "Media Selection"
 msgstr "Выбар групы пакетаў"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1007,7 +966,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1027,59 +986,49 @@ msgstr "Калі ласка, абярыце тып клавіятуры"
 msgid "Here is the full list of available keyboards:"
 msgstr ""
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, fuzzy, c-format
 msgid "Install/Upgrade"
 msgstr "Усталёўваем"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Усталёўка"
 
-#: steps_interactive.pm:147
-#, c-format
-msgid "Upgrade %s"
-msgstr ""
-
 #: steps_interactive.pm:151
 #, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgid "Upgrade %s"
 msgstr ""
 
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Усталёўваем"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1091,24 +1040,24 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Настройка IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1116,7 +1065,7 @@ msgid ""
 "DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, fuzzy, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1131,153 +1080,153 @@ msgstr ""
 "Калі вы не маеце яго, націсніце Адмяніць, каб адмяніць усталяванне з гэтага "
 "Cd."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Прагляд даступных пакетаў"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Загрузка"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Захаваць"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Загрузка файла"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Выбар групы пакетаў"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr ""
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr ""
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Падрыхтоўка ўсталяваньня"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Усталяванне пакету %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Атрымалася памылка ўпарадкавання пакетаў:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Усё роўна працягваць?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Асабісты выбар пакетаў"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Атрымалася памылка ўпарадкавання пакетаў:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Настройка пасля ўсталявання"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, fuzzy, c-format
 msgid "Updates"
 msgstr "Аднавіць"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1290,95 +1239,95 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Абсталяваньне"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, fuzzy, c-format
 msgid "Sound card"
 msgstr "Праграма гуказапісу"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, fuzzy, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Ці ёсць у вас іншы?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, fuzzy, c-format
 msgid "Graphical interface"
 msgstr "Запуск X пры старце сістэмы"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, fuzzy, c-format
 msgid "Network & Internet"
 msgstr "Сеткавы інтэрфейс"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Проксі"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, fuzzy, c-format
 msgid "configured"
 msgstr "Настроіць панэль"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Узровень бясьпекі"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "выключаны"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, fuzzy, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Меню не было захавана. Ці сапраўды вы жадаеце выйсці?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Падрыхтоўка загрузчыка"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1387,24 +1336,24 @@ msgid ""
 "root fs is: root=%s"
 msgstr ""
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Устаўце дыскету ў дыскавод %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Стварэнне дыскеты для ўсталявання"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1414,7 +1363,7 @@ msgstr ""
 "Некаторыя крокі не завершаны.\n"
 "Вы сапраўды жадаеце выйсці зараз?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, fuzzy, c-format
 msgid "Congratulations"
 msgstr "Прыміце віншаванні!"
@@ -1559,6 +1508,10 @@ msgid ""
 msgstr "Выход"
 
 #, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Вызначэнне прыладаў..."
+
+#, fuzzy
 #~ msgid "IceWm Desktop"
 #~ msgstr "Працоўны стол"
 
diff --git a/perl-install/install/share/po/bg.po b/perl-install/install/share/po/bg.po
index 28eaf5885..878164a88 100644
--- a/perl-install/install/share/po/bg.po
+++ b/perl-install/install/share/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-03-20 23:42+0200\n"
 "Last-Translator: Kolio Kolev <kolio_kolev@biotronica.net>\n"
 "Language-Team: Bulgarian <Mandriva User Group - Bulgaria <mandriva-"
@@ -22,31 +22,6 @@ msgstr ""
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -82,17 +57,17 @@ msgstr "Мрежа %s"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -100,7 +75,7 @@ msgstr ""
 "Свързване с Mandriva Linux web сайт за получаване на списъка с налични "
 "огледални сървъри..."
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -109,69 +84,69 @@ msgstr ""
 "Свързване с Mandriva Linux web сайт за получаване на списъка с налични "
 "огледални сървъри..."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Изберете огледален сървър,от който да получите пакетите"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Директория"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Не мога да намеря %s на %s"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Търси във вече инсталираните пакети..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Търся пакети за обновяване"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -183,18 +158,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Престартира"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -208,72 +183,72 @@ msgstr ""
 "\n"
 "Действително ли искате да изтриете тези пакети?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Грешка при четенето на файла %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Следните пакети ще трябва да се инсталират:\n"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Мрежа"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Моля изберете"
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Файлът съществува. Да бъде ли презаписан?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Лисват права"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "добавен източник %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Не мога да направя моментна \"снимка\" преди разделянето на диска "
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Снимки ще бъдат налични след инсталиране в %s"
@@ -284,11 +259,15 @@ msgid "Installation"
 msgstr "Инсталирам"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Настройка"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -314,22 +293,22 @@ msgstr "Включвам мрежата"
 msgid "Bringing down the network"
 msgstr "Изключване на мрежата"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Изпращам файлове..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Откриване в прогрес"
@@ -371,27 +350,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Появи се грешка"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d инсталационни транзакции пропаднаха"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Инсталиране на пакета %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Работна станция"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Офисна работна станция"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -400,7 +379,7 @@ msgstr ""
 "Офис програми: word-процесори (OpenOffice.org Writer, Kword), таблици "
 "(OpenOffice.org Calc, Kspread), преглед на PDF, и т.н."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -409,32 +388,32 @@ msgstr ""
 "Офис програми: word-процесори (kword, abiword), таблици (kspread, gnumeric), "
 "преглед на PDF, и т.н."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Игрална станция"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Забавни програми: аркадни игри, игри на маса, стратегии и т.н."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Мутимедийна станция"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Програми за пускане/поправяне на звук и видео"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Интернет станция"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -443,211 +422,193 @@ msgstr ""
 "Набор от инструменти за четене и изпращане на поща и новини (pine, mutt, "
 "tin..) и за обикаляне из Мрежата"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Мрежов компютър (клиент)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клиенти за различни протоколи включително SSH"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Инструменти за улесняване настройката на компютъра ви"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Конзолни инструменти"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Редактори, шелове, файлови инстрименти, терминали"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Разработка"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Библиотеки за разработка на C и C++, програми и include файлове"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Документация"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Книги и HOTWO-та за Linux и свободния софтуер"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Web Сървър"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Групуер"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Сървър"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Сървър, Firewall/Рутер"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Интернет gateway"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/Файл/_Нов"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix пощенски сървър"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Сървър с директории"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP сървър"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "FND/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Име на домейн и Мрежов Информационен Сървър"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Сървър на принтера"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Samba Сървър"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Сървър, Бази-данни"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, fuzzy, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL или MySQL сървър за бази-данни"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Сървър, Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache и Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Е-поща"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix пощенски сървър"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL или MySQL сървър за бази-данни"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Мрежов компютър, сървър"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS сървър, SMB сървър, Proxy сървър, SSH сървър"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Графична среда"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE работна станция"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -656,12 +617,12 @@ msgstr ""
 "The K Desktop Environment, проста среда с колекция от придружаващи "
 "инструменти"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome работна станция"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -669,7 +630,7 @@ msgid ""
 msgstr ""
 "Графична среда с потребителски набор от приложения и desktop инструменти"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "настолен компютър"
@@ -682,54 +643,52 @@ msgid ""
 msgstr ""
 "Графична среда с потребителски набор от приложения и desktop инструменти"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Други графични desktop-и"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, fuzzy, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm и т.н."
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Помощни програми"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Сървър"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Webmin Обслужване"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Конфигурация на Терминален Сървър в Mandriva Linux"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Мониторинг на мрежата"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "Контролен център на Mandriva Linux"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "ННеуспешна настройка на принтер \"%s\"!"
@@ -829,17 +788,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Избор на група пакети"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Избиране на пакети един по един"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Обща големина: %d / %d MB"
@@ -958,12 +917,12 @@ msgstr "Миминална инсталация"
 msgid "Software Management"
 msgstr "Управление на софтуер"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Изберете пакетите, които искате да инсталирате"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Инсталирам"
@@ -990,7 +949,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d пакета"
 msgstr[1] "%d пакета"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Обобщение"
@@ -1000,7 +959,7 @@ msgstr "Обобщение"
 msgid "Configure"
 msgstr "Настройка"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "не е конфигуриран"
@@ -1010,14 +969,14 @@ msgstr "не е конфигуриран"
 msgid "Media Selection"
 msgstr "Избор на група пакети"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1026,7 +985,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1046,59 +1005,49 @@ msgstr "Моля, изберете подреждане на клавиатур�
 msgid "Here is the full list of available keyboards:"
 msgstr "Ето пълен списък на достръпните страни"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Инсталирай/Обнови"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Това нова инсталация ли е или обновяване ?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Инсталирай"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Обновява %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Ключ за криптиране на %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Инсталирам"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1110,17 +1059,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Настройка на IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1130,7 +1079,7 @@ msgstr ""
 "за да стартирате системата си, ще трябва да създадете стартиращо поле в "
 "DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, fuzzy, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1141,7 +1090,7 @@ msgstr ""
 "за да стартирате системата си, ще трябва да създадете стартиращо поле в "
 "DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, fuzzy, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1156,19 +1105,19 @@ msgstr ""
 "Ако го нямате, натиснете Отмяна, за да избегнете инсталирането от този CD-"
 "ROM."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Търся налични пакети..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1177,52 +1126,52 @@ msgstr ""
 "Може изберете зареждане или запис на избора на пакети на флопи.\n"
 "Форматът е същият като auto_install генерираните дискети."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Натовареност"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Запазва"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Зареждане на файл"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Избор на група пакети"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Избраната големина е по-голяма от достъпното пространство"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Тип инсталация"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1231,82 +1180,82 @@ msgstr ""
 "Вие не сте избрали никаква група от пакети.\n"
 "Моля, изберете минималната инсталация кояти искате:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "С X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "С базова документация (препоръчва се!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Наистина минимална инсталация (особенно без urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Подготвям инсталацията"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Инсталиране на пакета %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Появи се грешка при поръчването на пакетите:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Да продължа ли все пак ?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Запази избор на пакети"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Появи се грешка при инсталиране на пакетите:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "След инсталационна настройка"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Обновяване"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1319,28 +1268,28 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Хардуер"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Звукова карта"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Имате ли ISA звукова карта?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, fuzzy, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1349,67 +1298,67 @@ msgstr ""
 "Изпълнете \"sndconfig\" след инсталация за да конфигурирате вашата звукова "
 "карта"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Няма открита звукова карта. Опитайте \"harddrake\" след инсталацията"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Графичен интерфайс"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Мрежа и интернет"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Профил "
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, fuzzy, c-format
 msgid "configured"
 msgstr "пренастройка"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Ниво на защита"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Защитна стена"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "активирано"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "изключен"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Вие не сте конфигурирали X. Сигурни ли сте, че искате това?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Подготовка на bootloader"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, fuzzy, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1422,24 +1371,24 @@ msgstr ""
 "Инсталацията ще продължи, но ще трябва\n"
 "да иползвате BootX, за да стартирате машината си"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Сложете празна дискета в устройство %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Подготвям дискета с автоматична инсталация"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1450,7 +1399,7 @@ msgstr ""
 "\n"
 "Наистина ли искате да излезете сега ?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Поздравления"
@@ -1594,6 +1543,10 @@ msgid ""
 "Exit"
 msgstr "Излез"
 
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Изпращам файлове..."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/bn.po b/perl-install/install/share/po/bn.po
index f73fb02dc..05b18cf9e 100644
--- a/perl-install/install/share/po/bn.po
+++ b/perl-install/install/share/po/bn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2007-02-19 00:44+0600\n"
 "Last-Translator: Tisa Nafisa <tisa_nafisa@yahoo.com>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -19,31 +19,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -83,92 +58,92 @@ msgstr "নেটওয়ার্ক (FTP)"
 msgid "Network (NFS)"
 msgstr "নেটওয়ার্ক (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "mirror এর ইউ-আর-এল?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "ইউআরএল অবশ্যই ftp:// অথবা http:// দিয়ে শুরু হবে"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "উপস্থিত মিররের তালিকার জন্য Mandriva Linux-এ সংযুক্ত করা হচ্ছে..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr "উপস্থিত মিররের তালিকার জন্য Mandriva Linux-এ যোগাযোগ করতে ব্যর্থ হয়েছে..."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "আপনি একটি মিরর পছন্দ করুন যেখান থেকে প্যাকেজগুলি নেবেন"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS সেটআপ"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "অনুগ্রহ করে আপনার NFS মিডিয়ার হোস্টনাম এবং ডিরেক্টরী প্রবেশ করান"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "হোস্টনাম পাওয়া যাচ্ছে না"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "ডিরেক্টরী অবশ্যই \"/\" দিয়ে শুরু হবে"
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS মাউন্টের জন্য হোস্টনাম ?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "ডিরেক্টরি"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "সম্পুরক"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "এই mirror এ কোন hdlist ফাইল পাওয়া যাচ্ছে না"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "যে সমস্থ প্যাকেজ ইনস্টল হয়ে আছে সেগুলি পর্যবেক্ষন করা হচ্ছে..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "আপগ্রেড করার জন্য প্যাকেজ খোঁজা হচ্ছে..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "আপগ্রেডের পূর্বে প্যাকেজ মুছে ফেলা হচ্ছে..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -180,18 +155,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "রিবুট"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -204,72 +179,72 @@ msgstr ""
 "\n"
 "আপনি কি আসলেই এই প্যাকেজগুলো মুছে ফেলতে চান?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s ফাইল পড়াতে ত্রুটি"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "নিম্নলিখিত ডিস্কগুলো নামান্তর করা হয়েছে:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (পূর্বের নাম %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "এইচ-টি-টি-পি"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "এফ-টি-পি"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "নেটওয়ার্ক"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "অনুগ্রহ করে একটি মিডিয়া নির্বাচন করুন"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "এই ফাইলটি আগে থেকেই আছে। করব?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "অনুমতি প্রদান করা হয়নি"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "ত্রুটিপূর্ণ NFS নাম"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "অগ্রহণযোগ্য মিডিয়া %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "পার্টিশন করার আগে স্ক্রিনশট তৈরী করা যায়নি"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "%s -এ ইনস্টল করার পরে স্ক্রিনশট পাওয়া যাবে"
@@ -280,11 +255,15 @@ msgid "Installation"
 msgstr " ইনস্টলেশন"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "কনফিগারেশন"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -309,22 +288,22 @@ msgstr "নেটওয়ার্ককে চালু করা হচ্ছে
 msgid "Bringing down the network"
 msgstr "নেটওয়ার্ককে বন্ধ করা হচ্ছে"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "%s ফাইল ডাউনলোড করা হচ্ছে..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "ভবিষ্যতে ব্যবহারের জন্য ডিস্কে কিছু প্যাকেজ কপি করা হচ্ছে"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "কপি সম্পন্ন হচ্ছে"
@@ -366,27 +345,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "একটি ত্রুটি সম্পাদিত হয়েছে"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "ইনস্টলেশন বিফল হয়েছে"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "%s প্যাকেজ সমূহ ইনস্টল করা হচ্ছে"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "ওয়ার্কষ্টেশন"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "অফিস ওয়ার্কষ্টেশন"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -395,7 +374,7 @@ msgstr ""
 "অফিস প্রোগ্রামসমূহ: ওয়ার্ডপ্রসেসর (OpenOffice.org Writer, Kword), স্প্রেডসিট "
 "(OpenOffice.org Calc, Kspread), PDF ফাইল প্রদর্শক ইত্যাদী"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -404,32 +383,32 @@ msgstr ""
 "অফিস প্রোগ্রামসমূহ: ওয়ার্ডপ্রসেসর (kword, abiword), স্প্রেডসিট (kspread, gnumeric), "
 "PDF ফাইল প্রদর্শক ইত্যাদী"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "গেশ ষ্টেশন"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "উদ্দীপনামূলক প্রোগ্রামসমূহ: আর্কেড, বোর্ড, স্ট্রেটেজি, ইত্যাদি"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "মাল্টিমিডিয়া ষ্টেশন"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "সাউন্ড এবং ভিডিও দেখার/এডিট করার প্রোগ্রামসমূহ"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "ইন্টারনেট ষ্টেশন"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -437,223 +416,205 @@ msgid ""
 msgstr ""
 "মেইল আদানপ্রদান, খবর পড়া এবং ওয়েব ব্রাউজিং (mutt, tin..) এর জন্য কিছু টুলের সেট"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "নেটওয়ার্ক কম্পিউটার (ক্লাইন্ট)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "SSH সহ বিভিন্ন প্রোটকলের জন্য ক্লাইন্টসমূহ"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "আপনার কম্পিউটারের কনফিগারেশন সহজ করার জন্য কিছু টুল"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "কনসল টুল"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "এডিটর, শেল, ফাইল টুল, টার্মিনাল সমূহ"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "ডেভলপমেন্ট"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C এবং C++ ডেভলপমেন্টের লাইব্রেরী, প্রগ্রাম এবং include ফাইলসমূহ"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "ডকুমেন্টেশন"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "লিনাক্স এবং ফ্রী সফটওয়ার সংক্রান্ত বই ও হাউটু (HOWTO)"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "লিনাক্সের সাধারণ আধার। তৃতীয়পক্ষ এপ্লিকেশন সমূহের সাপোর্ট"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "ওয়েব সার্ভার"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "এ্যপাচি"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "গ্রুপওয়্যার"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "কোলাব সার্ভার"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "ফায়ারওয়াল/রাউটার"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "ইন্টারনেট গেটওয়ে"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "মেইল/সংবাদ"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix মেইল সার্ভার, Inn সংবাদ সার্ভার"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "ডিরেক্টরি সার্ভার"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP সার্ভার"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "ডিএনএস/এনআইএস"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "ডোমেইন নেম এবং নেটওয়ার্ক ইনফরমেশন সার্ভার"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "ফাইল এবং প্রিন্টার শেয়ারিং সার্ভার"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS সার্ভার, Samba সার্ভার"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "ডেটাবেস"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL অথবা MySQL ডেটাবেস সার্ভার"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "ওয়েব/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "এ্যপাচি, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "মেইল"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix মেইল সার্ভার"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL অথবা MySQL ডেটাবেস সার্ভার"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "নেটওয়ার্ক কম্পিউটার সার্ভার"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS সার্ভার, SMB সার্ভার, Proxy সার্ভার, ssh সার্ভার"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "গ্রাফিকাল পরিবেশ"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE ওয়ার্কষ্টেশন"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "K ডেক্সটপ, কিছু সহযোগীমূলক টুলের সমন্বয়ে একটি সাধারণ গ্রাফিকাল পরিবেশ"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "গুহনোম ওয়ার্কষ্টেশন"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -661,7 +622,7 @@ msgid ""
 msgstr ""
 "ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "IceWm ডেস্কটপ"
@@ -674,54 +635,52 @@ msgid ""
 msgstr ""
 "ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "অন্যান্য গ্রাফিকাল ডেক্সটপ"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, ইত্যাদি"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "ইউটিলিটিসমূহ"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH সার্ভিস"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "ওয়েবমিন"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "ওয়েবমিন দূরবর্তী কনফিগারেশন সার্ভার"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "নেটওয়ার্ক ইউটিলিটিসমূহ/পর্যবেক্ষণ"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "পর্যবেক্ষণ টুলসমূহ, হিসাবরক্ষণ প্রসেস করে, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva উইজার্ডসমূহ"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "সার্ভার কনফিগার করার জন্য উইজার্ডসমূহ"
@@ -823,17 +782,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "প্যাকেজ গ্রুপ নির্বাচন"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "আলাদাভাবে প্যাকেজ নির্বাচন"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "মোট সাইজ: %d / %d এমবি"
@@ -953,12 +912,12 @@ msgstr "সর্বনিম্ন ইনস্টল"
 msgid "Software Management"
 msgstr "সফটওয়্যার ম্যানেজমেন্ট"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "আপনি যেই প্যাকেজগুলি ইনস্টল করতে চান তা পছন্দ করুন"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "ইনস্টলেশন"
@@ -985,7 +944,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d প্যাকেজ সমূহ"
 msgstr[1] "%d প্যাকেজ সমূহ"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "সারাংশ"
@@ -995,7 +954,7 @@ msgstr "সারাংশ"
 msgid "Configure"
 msgstr "কনফিগার"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "কনফিগার করা হয়নি"
@@ -1005,7 +964,7 @@ msgstr "কনফিগার করা হয়নি"
 msgid "Media Selection"
 msgstr "প্যাকেজ গ্রুপ নির্বাচন"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1014,7 +973,7 @@ msgstr ""
 "নিম্নলিখিত ইনস্টলেশন মিডিয়া পাওয়া গেছে।\n"
 "যদি আপনি এগুলোর মধ্যকার কিছু এড়িয়ে যেতে চান, তাহলে এখন সেগুলোকে অনির্বাচিত করুন।"
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1026,7 +985,7 @@ msgstr ""
 " এরপর হার্ডডিস্ক থেকে ইনস্টলেশন চলতে থাকবে এবং সিস্টেম সম্পূর্ন ইনস্টলেশনের পরও "
 "প্যাকেজগুলো রয়ে যাবে।"
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "CD গুলো সম্পুর্ন কপি করো "
@@ -1046,59 +1005,49 @@ msgstr "অনুগ্রহ করে আপনার কীবোর্ড �
 msgid "Here is the full list of available keyboards:"
 msgstr "এখানে উপস্থিত সমস্ত কীবোর্ডের তালিকা রয়োছে"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "ইনস্টল/আপগ্রড"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "এটা কি একটি ইনস্টলেশন না আপগ্রেড?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "ইনস্টল"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s আপগ্রড করো"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s -এর জন্য এনক্রিপশন কী"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr " ইনস্টলেশন"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1110,17 +1059,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE কনফিগারেশন চলছে"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1129,7 +1078,7 @@ msgstr ""
 "১ মেগাবাইটের bootstrap এর জন্য খালি জায়গা নেই! ইনস্টল অগ্রসর হবে, কিন্তু আপনার "
 "সিস্টেম বুট করার জন্য, আপনাকে DiskDrake থেকে bootstrap পার্টিশন তৈরী করতে হবে"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1139,7 +1088,7 @@ msgstr ""
 "আপনাকে একটি PPC PReP Boot বুটস্ট্র্যাপ তৈরী করতে হবে! ইনস্টলেশন অগ্রসর হবে, তবে "
 "আপনার সিস্টেম বুট করার জন্য, DiskDrake এর বুটস্ট্র্যাপ পার্টিশনটি প্রয়োজন"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1152,12 +1101,12 @@ msgstr ""
 "ঠিক আছে চাপুন।\n"
 "যদি সেটা আপনার না থাকে, এই সিডিরম থেকে ইনস্টলেশন এড়িয়ে যেতে বাতিল চাপুন।"
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "বরাদ্দকৃত প্যাকেজসমূহ খোঁজা হচ্ছে..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1166,7 +1115,7 @@ msgstr ""
 "ইনস্টলেশন অথবা সাম্প্রতিকীকরনের জন্য আপনার সিস্টেমে যথেষ্ট পরিমান জায়গা খালি নেই (%"
 "dএমবি > %dএমবি)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1175,52 +1124,52 @@ msgstr ""
 "অনুগ্রহ করে প্যাকেজ নির্বাচন লোড বা সংরক্ষণ বাছাই করুন।\n"
 "এই ফরম্যাটটি auto_install দ্বারা তৈরী ফাইলসমূহের মত।"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "চাপ"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "সংরক্ষণ"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "অগ্রহণযোগ্য ফাইল"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "গুনোম"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "প্যাকেজ গ্রুপ নির্বাচন"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "উপস্থিত জায়গার চাইতে নির্বাচিত সাইজটি অনেক বড়"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "ইনস্টলের ধরণ"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1229,82 +1178,82 @@ msgstr ""
 "আপনি প্যাকেজের কোন গ্রুপ নির্বাচন করেননি।\n"
 "অনুগ্রহ করে আপনি যে ক্ষুদ্রাকৃতির ইনস্টলেশন চান তা পছন্দ করুন:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X-এর সাথে"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "সাধারন নির্দেশিকার সাথে (পরামর্শ দেয়া হচ্ছে!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "এক্কেবারেই ক্ষুদ্র ইনস্টলেশন (বিশেষ করে কোন urpmi ছাড়া)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "ইনস্টলেশনের প্রস্তুতি চলছে"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "%s প্যাকেজ সমূহ ইনস্টল করা হচ্ছে"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "প্যাকেজগুলো বিন্যস্ত করতে গিয়ে একটি ভুল ছিল:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "তবুও যাব?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "পুনরায় চেষ্টা করো"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "এই প্যাকেজটি এড়িয়ে যাও"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "\"%s\" মাধ্যমের সব প্যাকেজ এড়িয়ে যাও"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "মিডিয়া এবং প্যাকেজের নির্বাচন এ ফিরে যাও"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "%s প্যাকেজ ইনস্টল করতে সমস্যা হয়েছে।"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "ইনস্টলের পরের কনফিগারেশন"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "অনুগ্রহ করে নিশ্চিত করুন যে সাম্প্রতিক মডিউলগুলো %s ড্রাইভ এ আছে"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "আপডেট"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1325,28 +1274,28 @@ msgstr ""
 "\n"
 "আপনি কি ইনস্টল আপডেট করতে চান?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s -এ %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "হার্ডওয়্যার"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "সাউন্ডকার্ড"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "আপনার কি একটি ISA সাউন্ড কার্ড আছে?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1355,67 +1304,67 @@ msgstr ""
 "ইনস্টল শেষ হবার পরে সাউন্ড কার্ড কনফিগার করার জন্য \"alsaconf\" অথবা \"sndconfig"
 "\" চালাও"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "কোন সাউন্ডকার্ড সনাক্ত হয়নি, ইনস্টলের পরে \"harddrake\" দিয়ে চেষ্টা করুন"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "গ্রাফিকাল ইন্টারফেস"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "নেটওয়ার্ট এবং ইন্টারনেট"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "প্রক্সিসমূহ"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "কনফিগার করা হয়েছে"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "সিকউরিটি লেভেল"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "ফায়ারওয়াল"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "সক্রিয় হয়েছে"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "অকার্যকর করা হয়েছে"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "আপনি X কনফিগার করেননি। আপনি কি নিশ্চিত এরকমটি চান?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Bootloader প্রস্তুত করা হচ্ছে..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1428,7 +1377,7 @@ msgstr ""
 "BootX বা অন্য কোন কিছু ব্যবহার করতে হবে। root fs এর জন্য কার্নেল প্রেরিত মান হবে: "
 "root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1436,17 +1385,17 @@ msgid ""
 msgstr ""
 "এই নিরাপত্তা লেভেলে, উইন্ডোজ পার্টিশনের ফাইলে প্রবেশ শুধুমাত্র অ্যাডমিনিস্ট্রেটরের আছে।"
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s ড্রাইভে একটি ফাঁকা ফ্লপি ঢোকান"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "সয়ং ইনস্টল ফ্লপি তৈরী করা হচ্ছে..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1457,7 +1406,7 @@ msgstr ""
 "\n"
 "আপনি কি এখন বের হতে চান?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "স্বাগতম"
@@ -1601,6 +1550,9 @@ msgid ""
 "Exit"
 msgstr "বাহির"
 
+#~ msgid "Downloading file %s..."
+#~ msgstr "%s ফাইল ডাউনলোড করা হচ্ছে..."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/br.po b/perl-install/install/share/po/br.po
index 8a38e87ec..cdaa1bae4 100644
--- a/perl-install/install/share/po/br.po
+++ b/perl-install/install/share/po/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 10.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-03-30 15:55+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
@@ -16,31 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1;plural=0\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -76,17 +51,17 @@ msgstr "Rouedad (FTP)"
 msgid "Network (NFS)"
 msgstr "Rouedad (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL ar melezour ?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Dao en deus an URL kregiñ gant ftp:// pe http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -94,7 +69,7 @@ msgstr ""
 "O taremprediñ al lec'hienn Mandriva Linux evit kaout roll ar melezouroù "
 "hegerz ..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -103,47 +78,47 @@ msgstr ""
 "Sac'het en ur taremprediñ al lec'hienn Mandriva Linux evit kaout roll ar "
 "melezouroù hegerz "
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Dibabit ur melezour da dapout ar pakadoù diwarnañ"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "Kefluniadur NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Roit anv ostiz ha renkell ho media NFS"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Mank ar ra anv an ostiz"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Anv ostiz ar marc'hañ NFS ?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Renkell"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "A-gresk"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -152,22 +127,22 @@ msgstr ""
 "Ne m'eus ket kavout ur roll pakadoù e-barzh ar melezour-mañ.  Kit da wiriañ "
 "al lec'hiadur-mañ zo mad."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "O kavout pakadoù zo staliet eo ..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "O kavout pakadoù da vremanaat ..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "O zilemel ar pakadoù a-raok bremanaat ..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -179,18 +154,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Adlañsañ"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -204,72 +179,72 @@ msgstr ""
 "\n"
 "Ha fellout a ra deoc'h da vat lemel anezho ?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fazi en ur lenn ar restr %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Adenvelet e oa ar bladenn/pladennoù-mañ :"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (a vez graet %s dioutañ diaraok)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Rouedad"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Dibabit ur vedia, mar plij"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Ar restr zo endeo. Rasklañ anezhañ ?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Aotre nac'het"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "N'eo ket un anv NFS mat"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "N'eo ket mat ar vedia %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "N'hellan ket sevel skrammpakeroù a-raok parzhañ"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skrammpakeroù a vo bet kavet goude staliañ e %s"
@@ -280,11 +255,15 @@ msgid "Installation"
 msgstr "O staliañ"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Kefluniadur"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -307,22 +286,22 @@ msgstr "O lañsañ ar rouedad"
 msgid "Bringing down the network"
 msgstr "O tizenaouiñ ar rouedad"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Gortozit mar plij, o tigas ar restr"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Oc'h enkargañ ar restr %s ..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Oc'h eilañ ur bern pakad hag a vo bet implijet diwezhatoc'h"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Oc'h eilañ"
@@ -366,27 +345,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Ur fazi zo bet :"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d gra zo bet sac'het"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Sac'het et bet staliañ ar pakadoù :"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Post labour"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Post labour burevek"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -395,7 +374,7 @@ msgstr ""
 "Programmoù burev : skridtreterezhioù (OpenOffice.org Writer, Kword), "
 "logerioù (OpenOffice.org Calc, Kspread), gwelerien PDF, ..."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -404,262 +383,244 @@ msgstr ""
 "Programmoù burev : skridtreterezhioù (kword, abiword), logerioù (kspread, "
 "gnumeric), gwelerien PDF, ..."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Arsav c'hoarioù"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Arsav liesvedia"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programmoù evit seniñ/aozañ tonioù ha videoù"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Arsav internet"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Urzhiataer rouedad (kliant)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Pratikoù evit meur a gomennad (da skouer ssh)"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ostilhoù evit kefluniañ hoc'h urzhiataer dre aes"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Ostilhoù letrin"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Aozerien, shelloù, ostilhoù restr, termenelloù"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Diorren"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Teuliadur"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Servijer Web"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Strollant"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Servijer Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Moger tan/Henter"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Dreuzell an Internet"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Posteloù/keleier"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Servijer posteloù Postfix, servijer keleier Inn"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Levr-bloaz"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Servijer FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Servijer DNS ha NIS"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Servijer rennañ restroù ha moullerez"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Servijer NFS, servijer Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Stlennvon"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Servijer stlennvon PostgreSQL ha MySQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Post"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Servijer postel Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "Servijer stlennvon PostgreSQL pe MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Servijer rouedad"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Servijer NFS, servijer SMB, servijer proksi, servijer SSH"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Endeo grafikel"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "Post burevek KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "An Endro Burev K gant he ostilhoù"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Post burevek GNOME"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Burev LXDE"
@@ -671,54 +632,52 @@ msgid ""
 "applications and desktop tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Burevioù c'hrafek all"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Mavegoù"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "Servijer SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Servijer Webmin ar gefluniadur a-bell"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Ostilhoù ar rouedad/diwall"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Skozelerien Mandriva"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Skozelerien evit kefluniañ ar servijer"
@@ -810,17 +769,17 @@ msgstr "Setu ur rakwell eus burev « %s »."
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Diuzadenn strollad pakadoù"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Diuz pakadoù unan hag unan"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Ment hollek : %d / %d Mo"
@@ -939,12 +898,12 @@ msgstr "Staliadur bihan"
 msgid "Software Management"
 msgstr "Merañ ar pakadoù"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Dibabit ar pakadoù a vennit staliañ"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "O staliañ"
@@ -970,7 +929,7 @@ msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakad"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Evit diverriñ"
@@ -980,7 +939,7 @@ msgstr "Evit diverriñ"
 msgid "Configure"
 msgstr "Kefluniañ"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "n'eo ket kefluniet"
@@ -990,14 +949,14 @@ msgstr "n'eo ket kefluniet"
 msgid "Media Selection"
 msgstr "Diuzadenn ar media"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1006,7 +965,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Eilañ tout an CDoù"
@@ -1026,59 +985,49 @@ msgstr "Dibabit reizhadur ho stokellaoueg mar plij"
 msgid "Here is the full list of available keyboards:"
 msgstr "Setu eo listenn leun ar stokellaoueg :"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Staliañ/Bremanaat"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Hag ur staliadur pe ur bremanadur eo ?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Staliadur"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Bremanaat %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Alc'hwez enrinegadur evit %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Staliadur nevez"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1090,24 +1039,24 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Kefluniañ IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1115,7 +1064,7 @@ msgid ""
 "DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1129,19 +1078,19 @@ msgstr ""
 "eo da c'houde.\n"
 "Ma n'emañ ket ganeoc'h gwaskit Nullañ evit chom hep staliañ ar Cd-Rom-se."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "O klask ar pakadoù hegerz ..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1150,52 +1099,52 @@ msgstr ""
 "Dibabit kargañ pe enrollañ choazh ar pakadoù mar plij.\n"
 "Ar furmad zo hini ar restroù auto_install."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Kargañ"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Enrollañ"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "N'eo ket mat ar restr"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Dibab ar burev"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Brasoc'h eo ment dibabet evit egor dieub"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Seurt ar staliadur"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1204,82 +1153,82 @@ msgstr ""
 "N'eus ket strollad pakadoù dibabet ebet.\n"
 "Dibabit ar staliañ vihanañ e fell deoc'h implij mar plij :"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Gant X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Gant un teuliadur bihan (kuzuliet !)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Staliadur bihan gwir (n'eus urpmi ebet)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "O prientiñ ar staliadur"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "O staliañ ar pakad %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Ur fazi zo bet en ur rummañ pakadoù :"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Kenderc'hel evelato ?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Adklask"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Tremen e-biou ar pakad-mañ"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Tremen e-biou pep pakad eud ar vedium « %s »"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Distro da ziuzadenn ar pakadoù hag ar media"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Ur fazi zo bet en ur staliañ ar pakad %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Kefluniadur goude staliañ"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Bremañaat"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1299,28 +1248,28 @@ msgstr ""
 "\n"
 "Mennout a rit staliañ anezho ?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s war %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Periantel"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Kartenn gwelet"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Hag ur gartenn gwelet ISA hoc'h eus ?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1329,68 +1278,68 @@ msgstr ""
 "Seveniñ « alsaconf » pe « sndconfig » goude staliañ evit kefluniañ ho kartenn "
 "klevet"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "N'eus kartenn gwelet kavet ebet. Kargañ « harddrake » goude ar staliadur"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Ketal kevregañ"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Rouedad hag Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proksioù"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "kefluniet"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Live an surentez"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Moger tan"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "bevaatet"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "diweredekaet"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "N'eo ket kefluniet X. Ha fellout a ra deoc'h da vat ober an dra-mañ ?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "O prientiñ ar c'harger loc'hañ ..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1399,24 +1348,24 @@ msgid ""
 "root fs is: root=%s"
 msgstr ""
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Lakait ur bladennig gwerc'h el lenner %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "O krouiñ ur bladennig staliañ emgefreek ..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1427,7 +1376,7 @@ msgstr ""
 "\n"
 "Mennout a rit kuitaat da vat bremañ ?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Brav"
@@ -1571,6 +1520,9 @@ msgid ""
 "Exit"
 msgstr "Kuitaat"
 
+#~ msgid "Downloading file %s..."
+#~ msgstr "Oc'h enkargañ ar restr %s ..."
+
 #~ msgid "IceWm Desktop"
 #~ msgstr "Burev IceWm"
 
diff --git a/perl-install/install/share/po/bs.po b/perl-install/install/share/po/bs.po
index 7fbe3f7bc..c89351c50 100644
--- a/perl-install/install/share/po/bs.po
+++ b/perl-install/install/share/po/bs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2006-09-16 10:33+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -21,31 +21,6 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -85,17 +60,17 @@ msgstr "Mreža (FTP)"
 msgid "Network (NFS)"
 msgstr "Mreža (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL mirrora?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL mora počinjati sa ftp:// ili http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -103,7 +78,7 @@ msgstr ""
 "Kontaktiram Mandriva Linux web stranicu da bih saznao listu dostupnih "
 "mirrora..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -112,47 +87,47 @@ msgstr ""
 "Nisam uspio kontaktirati Mandriva Linux web stranicu radi liste dostupnih "
 "mirrora"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Izaberite mirror sa kojeg će biti dobavljeni paketi"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "Podešavanje NFS-a"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Molim unesite ime računara i direktorij vašeg NFS medija"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Ime računara sa NFS serverom?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Direktorij"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -161,22 +136,22 @@ msgstr ""
 "Ne mogu pronaći hdlist datoteku na ovom mirroru. Provjerite da li je "
 "lokacija ispravna."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Tražim već instalirane pakete..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Pronalazim pakete za unaprjeđenje..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Uklanjam pakete prije unaprjeđenja..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -188,18 +163,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Restartuj"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -213,72 +188,72 @@ msgstr ""
 "\n"
 "Želite li zaista deinstalirati ove pakete?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Greška u čitanju datoteke %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Sljedeći diskovi su preimenovani:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (ranije pod imenom %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Mreža"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Molim izaberite medij"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Datoteka već postoji. Želite li pisati preko nje?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Nemate dozvolu"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Neispravan NFS naziv"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Neispravan medij %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Ne mogu napraviti snimak ekrana prije particioniranja"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Snimanje ekrana će biti dostupno nakon što instalirate u %s"
@@ -289,11 +264,15 @@ msgid "Installation"
 msgstr "Instalacija"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Podešavanje"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -319,22 +298,22 @@ msgstr "Pokrećem mrežu"
 msgid "Bringing down the network"
 msgstr "Zaustavljam mrežu"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Preuzimam datoteku %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiram neke pakete na disk radi buduće upotrebe"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiranje u toku"
@@ -376,27 +355,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Došlo je do greške"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Instalacija nije uspjela"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Instaliram paket %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Radna stanica"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Uredska radna stanica"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -405,7 +384,7 @@ msgstr ""
 "Uredski programi: obrada teksta (OpenOffice.org Write, KWord), tablični "
 "proračun (OpenOffice.org Calc, KSpread), PDF preglednici itd."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -414,32 +393,32 @@ msgstr ""
 "Uredski programi: obrada teksta (kword, abiword), tablični alati (kspread, "
 "gnumeric), pdf preglednici itd."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Stanica za igru"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Zabavni programi: arkadne igre, stolne igre, strategije itd."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedijalna stanica"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programi za pregled i editovanje zvuka i videa"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internet stanica"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -448,211 +427,193 @@ msgstr ""
 "Skup alata za čitanje i slanje pošte i news-a (mutt, tin...) i pregledanje "
 "Weba"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Mrežni računar (klijent)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klijenti za razne protokole uključujući ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Alati za lakše podešavanje računara"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Alati za konzolu"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editori, shellovi, alati za datoteke, terminali"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Programiranje"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C i C++ biblioteke, programi i include datoteke"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentacija"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Knjige i howto-i na temu Linuxa i slobodnog softvera"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Podrška za programe trećih lica"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Web server"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab server"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Firewall/Router"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet gateway"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Mail/News"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix mail server, Inn news server"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Imenički server"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP server"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Serveri domenskih imena i mrežnih informacija"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Server za dijeljenje datoteka i štampača"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS server, Samba server"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Baze podataka"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Server PostgreSQL ili MySQL baze podataka"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Mail"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix mail server"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL ili MySQL baza podataka"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Mrežni server"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS server, SMB server, Proxy server, ssh server"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafičko okruženje"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE radna stanica"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -660,12 +621,12 @@ msgid ""
 msgstr ""
 "K Desktop Environment, osnovno grafičko okruženje sa izborom pratećih alata"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME radna stanica"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -674,7 +635,7 @@ msgstr ""
 "Grafička okolina sa skupom korisnički orjentisanih programa i alata za radnu "
 "površinu"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "IceWm okruženje"
@@ -688,54 +649,52 @@ msgstr ""
 "Grafička okolina sa skupom korisnički orjentisanih programa i alata za radnu "
 "površinu"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Ostale grafičke okoline"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm itd."
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Alati"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH server"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin server za podešavanje sistema"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Mrežni alati i nadzor"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Alati za nadzor, praćenje procesa, tcpdump, nmap..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva čarobnjaci"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Čarobnjaci (wizardi) za podešavanje serverâ"
@@ -835,17 +794,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Izbor grupe paketa"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Izbor pojedinačnih paketa"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Ukupna veličina: %d / %d MB"
@@ -962,12 +921,12 @@ msgstr "Minimalna instalacija"
 msgid "Software Management"
 msgstr "Programi"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Izaberite pakete koje želite instalirati"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instaliram"
@@ -995,7 +954,7 @@ msgstr[0] "%d paketa"
 msgstr[1] "%d paketa"
 msgstr[2] "%d paketa"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Ukratko"
@@ -1005,7 +964,7 @@ msgstr "Ukratko"
 msgid "Configure"
 msgstr "Podesi"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "nije podešeno"
@@ -1015,7 +974,7 @@ msgstr "nije podešeno"
 msgid "Media Selection"
 msgstr "Izbor grupe paketa"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1024,7 +983,7 @@ msgstr ""
 "Pronađeni su sljedeći instalacioni mediji.\n"
 "Ako želite preskočiti neke od njih, možete ih isključiti sada."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1036,7 +995,7 @@ msgstr ""
 "Zatim će instalacija biti nastavljena sa hard diska, a paketi će ostati "
 "dostupni nakon što sistem bude instaliran."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiraj čitave CDove"
@@ -1056,59 +1015,49 @@ msgstr "Molim izaberite raspored vaše tastature"
 msgid "Here is the full list of available keyboards:"
 msgstr "Ovdje je puna lista svih dostupnih tastatura"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instaliraj/Unaprijedi"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Da li je ovo instalacija ili unaprjeđenje?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalacija"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Unaprijedi %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Ključ enkripcije za %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Instalacija"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1120,17 +1069,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Podešavam IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1140,7 +1089,7 @@ msgstr ""
 "nastaviti, ali da biste pokrenuli vaš sistem morate kreirati bootstrap "
 "particiju u DiskDrake-u"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1150,7 +1099,7 @@ msgstr ""
 "Trebate napraviti PPC PReP Boot bootstrap! Instalacija će nastaviti, ali da "
 "biste pokrenuli vaš sistem morate kreirati bootstrap particiju u DiskDrake-u"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1164,19 +1113,19 @@ msgstr ""
 "Ako ga nemate, pritisnite \"Odustani\" da preskočite instalaciju sa tog CD-"
 "ROMa."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Tražim dostupne pakete..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1185,52 +1134,52 @@ msgstr ""
 "Molim izaberite da li ćete učitati ili snimiti izbor paketa.\n"
 "Format je isti kao i diskete koje generiše auto_install."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Učitaj"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Snimi"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Neispravna datoteka"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Izbor grupe paketa"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Izabrana veličina je veća od slobodnog prostora"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Vrsta instalacije"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1239,82 +1188,82 @@ msgstr ""
 "Niste izabrali nijednu grupu paketa\n"
 "Molim izaberite vrstu minimalne instalacije koju želite:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Sa grafikom"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Sa osnovnom dokumentacijom (preporučeno)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Stvarno minimalna instalacija (posebno bez urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Pripremam instalaciju"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Instaliram paket %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Došlo je do greške pri raspoređivanju paketa:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Da nastavim?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Pokušaj ponovo"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Spasi izbor paketa"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Došlo je do greške kod instaliranja paketa:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Post-instalacijsko podešavanje"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Molim provjerite da je medij za ažuriranje u uređaju %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Ažuriranje"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1335,28 +1284,28 @@ msgstr ""
 "\n"
 "Da li želite instalirati ažurirane pakete ?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Zvučna kartica"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Imate li ISA zvučnu karticu?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1365,68 +1314,68 @@ msgstr ""
 "Pokrenite \"alsaconf\" ili \"sndconfig\" poslije instalacije kako biste "
 "podesili vašu zvučnu karticu"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Nije otkrivena zvučna kartica. Probajte \"harddrake\" poslije instalacije"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafički interfejs"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Mreža i Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxy-ji"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "podešeno"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Sigurnosni nivo"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktiviran"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "isključen"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Niste podesili X. Sigurno želite uraditi ovo?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Pripremam bootloader..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1439,7 +1388,7 @@ msgstr ""
 "neki drugi način za bootanje vašeg računara. Argument kernela za root fs je: "
 "root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1448,17 +1397,17 @@ msgstr ""
 "Na ovom sigurnosnom nivou, pristup datotekama na Windows particijama je "
 "dozvoljen samo administratoru."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Ubacite praznu disketu u jedinicu %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Pravim auto instalacijsku disketu..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1469,7 +1418,7 @@ msgstr ""
 "\n"
 "Da li zaista želite izaći sada?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Čestitamo"
@@ -1613,6 +1562,9 @@ msgid ""
 "Exit"
 msgstr "Izlaz"
 
+#~ msgid "Downloading file %s..."
+#~ msgstr "Preuzimam datoteku %s..."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/ca.po b/perl-install/install/share/po/ca.po
index 6e948afd3..2623d181d 100644
--- a/perl-install/install/share/po/ca.po
+++ b/perl-install/install/share/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2005-09-13 23:24+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -19,31 +19,6 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -79,17 +54,17 @@ msgstr "Xarxa (FTP)"
 msgid "Network (NFS)"
 msgstr "Xarxa (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL de la rèplica?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -97,7 +72,7 @@ msgstr ""
 "S'està contactant amb el servidor Mandriva Linux per obtenir la llista de "
 "rèpliques disponibles..."
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -106,69 +81,69 @@ msgstr ""
 "S'està contactant amb el servidor Mandriva Linux per obtenir la llista de "
 "rèpliques disponibles..."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Escolliu una rèplica des de la qual aconseguir els paquets"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Directori"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "No s'ha pogut trobat el fitxer hdlist en aquest rèplica"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "S'estan cercant els paquets ja instal·lats..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "S'estan cercant els paquets a actualitzar"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -180,18 +155,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Reinicia"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -204,72 +179,72 @@ msgstr ""
 "\n"
 "Voleu realment suprimir aquests paquets?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "S'ha produït un error en llegir el fitxer %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr ""
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Xarxa"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Si us plau escolliu"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "El fitxer ja existeix. El voleu sobreescriure?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "S'ha denegat el permís"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nom NFS incorrecte"
 
-#: any.pm:1193
+#: any.pm:1199
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "s'ha afegit la font %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "No es poden fer captures de pantalla abans de fer les particions"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Les captures estaran disponibles després d'instal·lar a %s"
@@ -280,11 +255,15 @@ msgid "Installation"
 msgstr "S'està instal·lant"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Configuració"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -309,22 +288,22 @@ msgstr "S'està activant la xarxa"
 msgid "Bringing down the network"
 msgstr "S'està desactivant la xarxa"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "S'està descarregant el fitxer %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Còpia en procés"
@@ -366,27 +345,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "S'ha produït un error"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Instal·lació fallida"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "S'està instal·lant el paquet %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Estació de treball"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Estació de treball d'oficina"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -396,7 +375,7 @@ msgstr ""
 "Kword), fulls de càlcul (OpenOffice.org Calc, Kspread), visualitzadors pdf, "
 "etc."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -405,32 +384,32 @@ msgstr ""
 "Programes d'ofimàtica: processadors de textos (kword, abiword), fulls de "
 "càlcul (kspread, gnumeric), visualitzadors pdf, etc."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Estació de jocs"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programes d'entreteniment: acció, jocs de taula, estratègia, etc."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Estació multimèdia"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programes de reproducció/edició de so i vídeo"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Estació d'Internet"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -439,211 +418,193 @@ msgstr ""
 "Conjunt d'eines per llegir i enviar correu i notícies (mutt, tin...) i per "
 "navegar pel Web"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Ordinador de xarxa (client)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients per a diferents protocols, incloent l'ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Eines per facilitar la configuració de l'ordinador"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Eines de consola"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editors, intèrprets d'ordres, eines de fitxer, terminals"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Desenvolupament"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Biblioteques de desenvolupament C i C++, programes i fitxers include"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Documentació"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Llibres i Com es fa... sobre el Linux i el programari lliure"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Base Estàndard de Linux (LSB). Suport a aplicacions de tercers"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Servidor Web"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Servidor Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Tallafoc/Encaminador"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Passarel·la a Internet"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Correu/Notícies"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Servidor de correu Postfix, Servidor de noticies Inn"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Servidor de directori"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Servidor FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Servidor de Noms de Domini i d'Informació de la Xarxa (DNS/NIS)"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Servidor de compartició de fitxers i impressores"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Servidor NFS, Servidor Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Base de dades"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Servidor de bases de dades PostgreSQL i MySQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache i Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Correu"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Servidor de correu Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "Servidor de bases de dades PostgreSQL o MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Servidor d'ordinador de xarxa"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Entorn gràfic"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "Estació de treball KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -652,12 +613,12 @@ msgstr ""
 "L'entorn d'escriptori K (KDE), l'entorn gràfic bàsic que inclou diverses "
 "eines"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Estació de treball GNOME"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -666,7 +627,7 @@ msgstr ""
 "Entorn gràfic amb un conjunt d'aplicacions i eines d'escriptori fàcil "
 "d'utilitzar"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Escriptori IceWm"
@@ -680,55 +641,53 @@ msgstr ""
 "Entorn gràfic amb un conjunt d'aplicacions i eines d'escriptori fàcil "
 "d'utilitzar"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Altres escriptoris gràfics"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Utilitats"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "Servidor SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
 #
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Utilitats de xarxa/Monitorització"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Auxiliars de Mandriva"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Auxiliars per configurar el servidor"
@@ -829,17 +788,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Selecció del grup de paquets"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Selecció individual de paquets"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Mida total: %d / %d MB"
@@ -958,12 +917,12 @@ msgstr "Instal·lació mínima"
 msgid "Software Management"
 msgstr "Gestor de programari"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Escolliu els paquets que voleu instal·lar"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "S'està instal·lant"
@@ -990,7 +949,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d paquet"
 msgstr[1] "%d paquets"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Resum"
@@ -1000,7 +959,7 @@ msgstr "Resum"
 msgid "Configure"
 msgstr "Configura"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "no configurat(da)"
@@ -1010,14 +969,14 @@ msgstr "no configurat(da)"
 msgid "Media Selection"
 msgstr "Selecció del grup de paquets"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1026,7 +985,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copia els CDs sencers"
@@ -1046,59 +1005,49 @@ msgstr "Si us plau, seleccioneu la disposició del vostre teclat"
 msgid "Here is the full list of available keyboards:"
 msgstr "Aquesta és la llista completa de teclats disponibles"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instal·la/Actualitza"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Es tracta d'una instal·lació o d'una actualització?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instal·la"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Actualitza %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Clau de xifratge per a %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "S'està instal·lant"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1110,17 +1059,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "S'està configurant l'IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1130,7 +1079,7 @@ msgstr ""
 "continuarà, però per iniciar el sistema necessitareu crear la partició de "
 "bootstrap amb el DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, fuzzy, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1141,7 +1090,7 @@ msgstr ""
 "continuarà, però per iniciar el sistema necessitareu crear la partició de "
 "bootstrap amb el DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1155,19 +1104,19 @@ msgstr ""
 "Si no el teniu, premeu Cancel·la per no fer la instal·lació des d'aquest Cd-"
 "Rom."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "S'estan cercant els paquets disponibles..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1177,52 +1126,52 @@ msgstr ""
 "El format és el mateix que en els disquets generats d'instal·lació "
 "automàtica."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Càrrega"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Desa"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Fitxer incorrecte"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Selecció del grup de paquets"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "La mida seleccionada és superior a la disponible"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipus d'instal·lació"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1231,82 +1180,82 @@ msgstr ""
 "No heu seleccionat cap grup de paquets.\n"
 "Escolliu la instal·lació mínima que voleu:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Amb X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Amb la documentació bàsica (recomanat!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instal·lació realment mínima (especialment no urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "S'està preparant la instal·lació"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "S'està instal·lant el paquet %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "S'ha produït un error en ordenar els paquets:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Voleu seguir igualment?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Desa la selecció de paquets"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "S'ha produït un error en instal·lar els paquets:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuració posterior a la instal·lació"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Actualitzacions"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1328,28 +1277,28 @@ msgstr ""
 "\n"
 "Voleu instal·lar les actualitzacions?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s a %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Maquinari"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Targeta de so"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Teniu una targeta de so ISA?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1358,69 +1307,69 @@ msgstr ""
 "Executeu \"alsacont\" després de la instal·lació per configurar la targeta "
 "de so"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "No s'ha detectat cap targeta de so. Proveu amb \"harddrake\" després de la "
 "instal·lació"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfície gràfica"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Xarxa i Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Intermediaris"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "configurat"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Nivell de seguretat:"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Tallafoc"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "activat"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "inhabilita"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "No heu configurat X. Segur que ho voleu així?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "S'està preparant el carregador de l'arrencada..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, fuzzy, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1433,7 +1382,7 @@ msgstr ""
 "La instal·lació continuarà, però us caldrà utilitzar el BootX\n"
 "o algun altre mètode per arrencar l'ordinador"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1442,17 +1391,17 @@ msgstr ""
 "En quest nivell de seguretat, l'accés a les particions de Windows està "
 "restringit a l'administrador."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Inseriu un disquet en blanc a la unitat %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "S'està creant el disquet d'instal·lació automàtica"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1463,7 +1412,7 @@ msgstr ""
 "\n"
 "Segur que voleu sortir ara?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Felicitats"
@@ -1607,6 +1556,9 @@ msgid ""
 "Exit"
 msgstr "Surt"
 
+#~ msgid "Downloading file %s..."
+#~ msgstr "S'està descarregant el fitxer %s..."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/cs.po b/perl-install/install/share/po/cs.po
index 75c0aecf9..30a75dedd 100644
--- a/perl-install/install/share/po/cs.po
+++ b/perl-install/install/share/po/cs.po
@@ -7,41 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-04-02 22:52+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Vaše pracovní prostředí na USB klíčence"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% otevřená distribuce Mandriva Linux"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Prozkoumejte Linux jednoduše s Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Plné pracovní prostředí Mandriva Linux, s podporou"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distribuce pro potřeby každého"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -81,22 +57,24 @@ msgstr "Síť (FTP)"
 msgid "Network (NFS)"
 msgstr "Síť (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL zrcadla?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL musí začínat na ftp:// nebo http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
-msgstr "Kontaktuji web Mandriva Linux pro získání seznamu dostupných zrcadel..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr ""
+"Kontaktuji web Mandriva Linux pro získání seznamu dostupných zrcadel..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -105,47 +83,47 @@ msgstr ""
 "Selhalo kontaktování webu Mandriva Linux pro získání seznamu dostupných "
 "zrcadel"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Zvolte si zrcadlo (mirror) pro stahování balíčků"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "Nastavení NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Zadejte prosím název počítače a adresář vašeho zařízení NFS"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Chybí název počítače"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Adresář musí začínat znakem \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Název počítače připojení NFS?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Adresář"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Dodatečný"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -154,22 +132,22 @@ msgstr ""
 "Nelze nalézt soubor hdlist na tomto zrcadle. Ujistěte se, že umístění je "
 "správné."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Prohledávám již instalované balíčky..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Vyhledávám balíčky pro aktualizaci..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Odstraňují se balíčky před aktualizací..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -190,18 +168,18 @@ msgstr ""
 "prosím systém\n"
 "a aktualizujte systém pomocí apletu pro aktualizaci distribuce Mandriva."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Restartovat"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Pokračovat"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -214,72 +192,72 @@ msgstr ""
 "\n"
 "Opravdu chcete odebrat tyto balíčky?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Chyba při čtení souboru %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Následující disk(y) byly přejmenovány:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (předchozí název %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Síť"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Prosím vyberte zdroj"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Soubor již existuje. Přepsat?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Přístup odepřen"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Chybný název NFS"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Chybný zdroj %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Nelze provést sejmutí obrazovky před rozdělením disků"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Sejmuté obrazovky budou dostupné po instalaci v adresáři %s"
@@ -290,11 +268,15 @@ msgid "Installation"
 msgstr "Instalace"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Nastavení"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -320,22 +302,22 @@ msgstr "Startuji síť"
 msgid "Bringing down the network"
 msgstr "Zastavuji síť"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Prosím počkejte, získávám soubor"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Stahuji soubor %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopíruji některé balíčky na disky pro budoucí použití"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Probíhá kopírování"
@@ -379,27 +361,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Nastala chyba:"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instalačních procesů selhalo"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Instalace balíčků selhala:"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Pracovní stanice"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Kancelářská stanice"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -408,7 +390,7 @@ msgstr ""
 "Programy pro kancelář: textové procesory (OpenOffice.org Writer, Kword), "
 "tabulkové procesory (OpenOffice.org Calc, Kspread), prohlížeče PDF a další"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -417,32 +399,32 @@ msgstr ""
 "Programy pro kancelář: textové procesory (KWord, Abiword), tabulkové "
 "procesory (KSpread, Gnumeric), prohlížeče PDF a další"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Hry"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Zábavné programy: deskové hry, strategie, atd."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediální stanice"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programy pro přehrávání/editaci zvuku a videa"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internetová stanice"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -451,211 +433,193 @@ msgstr ""
 "Soubor nástrojů pro čtení a posílaní el. pošty a příspěvků do diskusních "
 "skupin (mutt, tin..) a pro prohlížení Webu"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Síťový počítač (klient)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienti pro různé verze protokolu ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Nástroje pro snadnou konfiguraci počítače"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konzolové nástroje"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editory, shelly, souborové nástroje, terminály"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Vývoj"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Knihovny pro vývoj v C a C++, programy a hlavičkové soubory"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentace"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Knihy a Howto o Linuxu a Svobodném Software"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Standardní Báze Linuxu (LSB): Podpora aplikací jiných dodavatelů"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Webový server"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Server Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Firewall/Router"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internetová brána"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Pošta/Diskusní skupiny"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Poštovní server Postfix, server diskusních skupin Inn"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Server adresářových služeb"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Server pro domény a síťové informace"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Server pro sdílení souborů a tiskáren"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Server NFS, server Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Databáze"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Databázové servery PostgreSQL a MySQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache a Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Pošta"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Poštovní server Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "Databázové servery PostgreSQL nebo MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Síťový server"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS server, SMB server, Proxy server, SSH server"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafické prostředí"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "Pracovní stanice s KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -664,12 +628,12 @@ msgstr ""
 "K Desktop Environment, základní grafické prostředí s kolekcí doprovodných "
 "nástrojů"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Pracovní stanice s GNOME"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -678,7 +642,7 @@ msgstr ""
 "Grafické prostředí s uživatelsky přívětivým seskupením aplikací a pracovní "
 "plochou"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE Desktop"
@@ -689,57 +653,55 @@ msgid ""
 "A lightweight & fast graphical environment with user-friendly set of "
 "applications and desktop tools"
 msgstr ""
-"Jednoduché a rychlé grafické prostředí s uživatelsky přívětivou sadou aplikací "
-"a nástrojů"
+"Jednoduché a rychlé grafické prostředí s uživatelsky přívětivou sadou "
+"aplikací a nástrojů"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Další grafické desktopy"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm a další"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Užitečné nástroje"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "Server SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Server pro vzdálené nastavení Webminu"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Síťové nástroje/Sledování"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Nástroje pro sledování, evidenci procesů, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Průvodci Mandriva"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Průvodci nastavením serverů"
@@ -838,17 +800,17 @@ msgstr "Zde se nachází náhled pracovního prostředí %s."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klepněte na obrázky, chcete-li vidět větší náhled"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Výběr skupiny balíčků"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Výběr jednotlivých balíčků"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Celková velikost: %d / %d MB"
@@ -908,7 +870,8 @@ msgstr "aby bylo zachováno %s"
 msgid ""
 "You can not select this package as there is not enough space left to install "
 "it"
-msgstr "Nemůžete vybrat tento balíček, protože pro jeho instalaci není dost místa"
+msgstr ""
+"Nemůžete vybrat tento balíček, protože pro jeho instalaci není dost místa"
 
 #: steps_gtk.pm:455
 #, c-format
@@ -965,12 +928,12 @@ msgstr "Minimální instalace"
 msgid "Software Management"
 msgstr "Správa software"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Vyberte si balíčky, které chcete nainstalovat"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instaluji"
@@ -998,7 +961,7 @@ msgstr[0] "%d balíček"
 msgstr[1] "%d balíčky"
 msgstr[2] "%d balíčků"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Souhrn"
@@ -1008,7 +971,7 @@ msgstr "Souhrn"
 msgid "Configure"
 msgstr "Nastavit"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "nenastaveno"
@@ -1018,7 +981,7 @@ msgstr "nenastaveno"
 msgid "Media Selection"
 msgstr "Výběr zdrojů"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1027,7 +990,7 @@ msgstr ""
 "Byla nalezeny následující instalační zdroje.\n"
 "Pokud chcete některé z nich vynechat, můžete je nyní odznačit."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1039,7 +1002,7 @@ msgstr ""
 "Instalace pak bude pokračovat z pevného disku a balíčky zůstanou dostupné i "
 "poté, co je systém plně nainstalován."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopírovat celá CD"
@@ -1059,59 +1022,49 @@ msgstr "Vyberte si rozložení vaší klávesnice"
 msgid "Here is the full list of available keyboards:"
 msgstr "Zde je úplný seznam dostupných klávesnic:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalace/Aktualizace"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Jedná se o instalaci nebo aktualizaci?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalace"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Aktualizace %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Aktualizace z 32bitové na 64bitovou distribuci není podporována"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Aktualizace ze 64bitové na 32bitovou distribuci není podporována"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Šifrovací klíč pro %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Zrušit instalaci, restartovat systém"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Nová instalace"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Aktualizace předchozí instalace (nedoporučuje se)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1130,17 +1083,17 @@ msgstr ""
 "Varování: před volbou \"Nové instalace\" si zazálohujte veškerá vaše\n"
 "osobní data."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Nastavuji IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1150,7 +1103,7 @@ msgstr ""
 "pokračovat, ale pro spuštění systému musíte vytvořit bootstrap oddíl pomocí "
 "DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1160,7 +1113,7 @@ msgstr ""
 "Je nutné vytvořit zavedení PPC PReP Boot! Instalace může pokračovat, ale pro "
 "zavedení systému musíte vytvořit zaváděcí oddíl pomocí DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1172,12 +1125,12 @@ msgstr ""
 "Prosím vložte CD označené \"%s\" do mechaniky a stiskněte Ok.\n"
 "Pokud toto CD nemáte, stiskněte Zrušit a toto CD nebude nainstalováno."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Hledám dostupné balíčky..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1186,7 +1139,7 @@ msgstr ""
 "Váš systém nemá dostatek volného místa pro instalaci nebo aktualizaci (%dMB "
 "> %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1195,52 +1148,52 @@ msgstr ""
 "Vyberte si, zda chcete uložit nebo načíst výběr balíčků.\n"
 "Formát je stejný jako u souborů generovaných pomocí auto_install."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Načíst"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Uložit"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Chybný soubor"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Výběr pracovního prostředí"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Můžete vybrat profil vašeho pracovního prostředí."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Velikost vybraných balíčků je větší než místo na disku"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Typ instalace"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1249,84 +1202,84 @@ msgstr ""
 "Nevybrali jste žádnou skupinu balíčků.\n"
 "Vyberte si prosím alespoň minimální instalaci:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X prostředí"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Základní dokumentace (doporučeno!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Opravdu minimální instalace (speciálně bez urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Připravuji instalaci"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Instaluji balíček %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Stala se chyba při řazení balíčků:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Přesto pokračovat?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Zkusit znovu"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Vynechat tento balíček"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Vynechat všechny balíčky ze zdroje \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Vrátit se zpět k výběru zdrojů a balíčků"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Při instalaci balíčku %s nastala chyba."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Probíhá nastavování po instalaci"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Ujistěte se prosím, že se médium s aktualizovanými moduly nachází v jednotce "
 "%s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Aktualizace"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1347,28 +1300,28 @@ msgstr ""
 "\n"
 "Chcete nainstalovat aktualizace?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Zvuková karta"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Máte nějakou zvukovou kartu na ISA sběrnici?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1377,67 +1330,69 @@ msgstr ""
 "Pro nastavení zvukové karty spusťte po instalaci \"alsaconf\" nebo "
 "\"sndconfig\""
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "Nebyla nalezena zvuková karta. Zkuste spustit po instalaci \"harddrake\"."
+msgstr ""
+"Nebyla nalezena zvuková karta. Zkuste spustit po instalaci \"harddrake\"."
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafické rozhraní"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Síť & Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxy"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "nastaveno"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Úroveň zabezpečení"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktivováno"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "vypnuto"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
-msgstr "Nemáte nastaveno prostředí X. Chcete jej skutečně ponechat nenastavené?"
+msgstr ""
+"Nemáte nastaveno prostředí X. Chcete jej skutečně ponechat nenastavené?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Připravuji zaváděcí program..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Prosím o strpení, může to chvíli trvat…"
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1450,7 +1405,7 @@ msgstr ""
 "BootX nebo jiný nástroj pro zavedení systému. Parametr jádra pro kořenový "
 "souborový systém je: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1459,17 +1414,17 @@ msgstr ""
 "V této úrovní zabezpečení je přístup k souborům na oddíle s Windows omezena "
 "pouze na uživatele administrátor."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Vložte prázdnou disketu do %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Vytvářím disketu pro automatickou instalaci..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1480,7 +1435,7 @@ msgstr ""
 "\n"
 "Chcete opravdu nyní skončit?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulujeme"
@@ -1624,3 +1579,26 @@ msgid ""
 "Exit"
 msgstr "Konec"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Vaše pracovní prostředí na USB klíčence"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% otevřená distribuce Mandriva Linux"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Prozkoumejte Linux jednoduše s Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Plné pracovní prostředí Mandriva Linux, s podporou"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distribuce pro potřeby každého"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Stahuji soubor %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Aktualizace z 32bitové na 64bitovou distribuci není podporována"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Aktualizace ze 64bitové na 32bitovou distribuci není podporována"
diff --git a/perl-install/install/share/po/cy.po b/perl-install/install/share/po/cy.po
index 6cf7bf20d..a7e6dac9f 100644
--- a/perl-install/install/share/po/cy.po
+++ b/perl-install/install/share/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva Linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-02-27 07:50-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
@@ -20,31 +20,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Eich bwrdd gwaith ar allwedd USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Mandriva Linux - y dosbarthiad cod agored 100%%"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Arbrofi rhwydd gyda Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Bwrdd gwaith Mandriva Linux llawn, gyda chefnogaeth"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: dosbarthiad ar gyfer angen pawb"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -85,23 +60,23 @@ msgstr "Rhwydwaith (FTP)"
 msgid "Network (NFS)"
 msgstr "Rhwydwaith (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL y drych?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Rhaid i'r URL gychwyn gyda ftp:// neu http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "Cysylltu â safle gwe Mandriva Linux i estyn y rhestr o ddrychau..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -109,47 +84,47 @@ msgid ""
 msgstr ""
 "Methwyd cysylltu â safle gwe Mandriva Linux i estyn y rhestr o ddrychau"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Dewiswch ddrych lle mae modd estyn y pecynnau"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "Ffurfweddiad NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Rhowch enw'r gwesteiwr a chyfeiriadur eich cyfrwng NFS"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Enw gwesteiwr ar goll"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Rhaid i gyfeiriadur gychwyn gyda \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Enw gwesteiwr arosod NFS?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Cyfeiriadur"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Atodol"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -158,22 +133,22 @@ msgstr ""
 "Methu canfod ffeil hdlist ar y drych. Gwnewch yn siwr fod y lleoliad yn "
 "gywir."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Edrych ar becynnau wedi eu gosod yn barod..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Canfod pecynnau i'w uwchraddio..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Tynnu pecynnau cyn diweddaru..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -194,18 +169,18 @@ msgstr ""
 "ail gychwynnwch eich system a diweddaru gan ddefnyddio rhaglennig diweddaru "
 "Mandriva."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Ail gychwyn"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Parhau"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -219,72 +194,72 @@ msgstr ""
 "\n"
 "Ydych chi am dynnu'r pecynnau hyn?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Gwall wrth ddarllen ffeil %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Mae'r disg(iau) canlynol wedi eu hail enwi:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (ei enw blaenorol oedd %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Rhwydwaith"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Dewiswch gyfrwng"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Mae'r ffeil yn bodoli eisoes. Ysgrifennu drosti?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Caniatâd wedi ei wrthod."
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Enw NFS gwael"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Cyfrwng %s gwael"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Meth creu lluniau o'r sgrin cyn rhannu"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Bydd lluniau o'r sgrin ar gael ar ôl gosod yn %s"
@@ -295,11 +270,15 @@ msgid "Installation"
 msgstr "Gosod"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Ffurfweddiad"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -324,22 +303,22 @@ msgstr "Cychwyn y rhwydwaith"
 msgid "Bringing down the network"
 msgstr "Cau'r rhwydwaith"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Arhoswch, estyn ffeil"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Llwytho ffeil %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Copïo rhai pecynnau ar ddisg ar gyfer defnydd yn y dyfodol"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Wrthi'n copïo..."
@@ -383,27 +362,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Digwyddodd gwall"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "Methodd trafod gosod %d"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Gosod pecyn %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Gweithfan"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Gweithfan Swyddfa"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -412,7 +391,7 @@ msgstr ""
 "Rhaglenni swyddfa: prosesydd geiriau (OpenOffice.org Writer, Kword), "
 "taenlenni (OpenOffice.org Calc, Kspread), ddarllenydd pdf, ag ati"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -421,32 +400,32 @@ msgstr ""
 "Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword), taenlenni (kspread, "
 "gnumeric), ddarllenydd pdf, ag ati"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Man chwarae"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Rhaglenni difyrrwch: arcêd, gemau bwrdd, strategaeth, ag ati"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Man aml-gyfrwng"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Chwarae sain a fideo/rhaglenni golygu"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Man rhyngrwyd"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -455,211 +434,193 @@ msgstr ""
 "Casgliad o offer i ddarllen ac anfon e-bost a newyddion (mutt, tin..) ac i "
 "bori'r We"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Cyfrifiadur Rhwydwaith (cleient)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Cleientiaid ar gyfer protocolau amrywiol yn cynnwys ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Offer i wneud ffurfweddu'ch cyfrifiadur yn haws"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Offer y Consol"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Golygyddion, cregyn, offer ffeilio, terfynellau"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Datblygiad"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Llyfrgelloedd datblygiadol C a C++, rhaglenni a ffeiliau cynnwys"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dogfennau"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Llyfrau a Howto's ar Linux a Meddalwedd Rhydd"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Cefnogaeth i raglenni trydydd parti"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Gweinydd Gwe"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Grwpwar"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Gweinydd Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Mur Gwarchod/Llwybrydd"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Porth i'r rhyngrwyd"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "E-bost/Newyddion"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Gweinydd e-bost Postfix, gweinydd newyddion Inn"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Cyfeiriadur Gweinydd"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Gweinydd FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Gweinydd Enw Parth a Gwybodaeth Rhwydwaith"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Gweinydd Ffeil a Rhannu Argraffydd"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Gweinydd NSF, gweinydd Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Gweinydd CronfaDdata PostgreSQL a MySQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Gwe/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "E-bost"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Gweinydd e-bost Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "Gweinydd cronfa data PostgreSQL neu MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Gweinydd Cyfrifiadur Rhwydwaith"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Gweinydd NFS, gweinydd SMB, gweinydd dirprwyol, gweinydd ssh"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Amgylchedd Graffig"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "Man Gwaith KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -668,12 +629,12 @@ msgstr ""
 "KDE - Amgylchedd Bwrdd gwaith K, yr amgylchedd graffig sylfaenol gyda "
 "chasgliad o offer"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Man Gwaith Gnome"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -682,7 +643,7 @@ msgstr ""
 "Amgylchedd graffig gyda chasgliad o raglenni ac offer bwrdd gwaith hawdd eu "
 "defnyddio."
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Bwrdd Gwaith LXDE"
@@ -696,54 +657,52 @@ msgstr ""
 "Amgylchedd graffig gyda chasgliad o raglenni ac offer bwrdd gwaith hawdd eu "
 "defnyddio."
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Byrddau Gwaith Graffigol Eraill"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, ag ati"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Gwasanaethau"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "Gweinydd SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Gweinydd Ffurfweddiad Pell Webmin"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Gwasanaethau Rhwydwaith/Monitro"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Offer monitro, cyfrifo prosesau, tcpdunp, nmap..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Dewiniaid Mandriva"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Dewiniaid i ffurfweddu gweinydd"
@@ -843,17 +802,17 @@ msgstr "Dyma ragolwg o fwrdd gwaith '%s'."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Cliciwch ar y delweddau i weld y rhagolwg yn fwy"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Dewis Grŵp y Pecyn"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Dewis pecynnau unigol."
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Cyfanswm maint: %d / %d MB"
@@ -970,12 +929,12 @@ msgstr "Gosodiad lleiaf"
 msgid "Software Management"
 msgstr "Rheoli Meddalwedd"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Dewiswch y pecynnau yr hoffech chi eu gosod"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Gosod"
@@ -1002,7 +961,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pecyn"
 msgstr[1] "%d pecyn"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Crynodeb"
@@ -1012,7 +971,7 @@ msgstr "Crynodeb"
 msgid "Configure"
 msgstr "Ffurfweddu"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "heb ffurfweddu"
@@ -1022,7 +981,7 @@ msgstr "heb ffurfweddu"
 msgid "Media Selection"
 msgstr "Dewis Cyfrwng"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1031,7 +990,7 @@ msgstr ""
 "Mae'r cyfrwng gosod canlynol wedi ei ganfod.\n"
 "Os hoffech hepgor rhai ohonynt, dad-ddewiswch nhw nawr."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1044,7 +1003,7 @@ msgstr ""
 "Bydd yna'n parhau o'r disg caled a bydd y pecynnau ar gael unwaith i'r "
 "system gael ei osod yn gyflawn."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copïo'r CDau cyfan"
@@ -1064,17 +1023,17 @@ msgstr "Dewiswch gynllun eich bysellfwrdd"
 msgid "Here is the full list of available keyboards:"
 msgstr "Dyma restr lawn o'r bysellfyrddau sydd ar gael:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Gosod/Diweddaru"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Gosod neu ddiweddaru?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
@@ -1083,42 +1042,32 @@ msgstr ""
 "_:Enw yw hwn:\n"
 "Gosod"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Diweddaru %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Nid yw diweddaru o ddosbarthiad 32did i 64did yn cael ei gynnal"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Nid yw diweddaru o ddosbarthiad 64did i 32did yn cael ei gynnal"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Allwedd amgryptio ar gyfer %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Atal y gosod, ailgychwyn y system"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Gosodiad Newydd"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Diweddaru'r gosodiad blaenorol (argymell i beidio)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1137,17 +1086,17 @@ msgstr ""
 "Rhybudd : dylech wneud copi wrth gefn o'ch data personol cvyn dewis \"New\n"
 "Installation\"."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Ffurfweddu IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1156,7 +1105,7 @@ msgstr ""
 "Nid oes lle rhydd ar gyfer yr ymlwythwr 1MB! Bydd y gosod yn parhau, ond i "
 "gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1166,7 +1115,7 @@ msgstr ""
 "Bydd angen i chi greu llwythwr mwdwl PPC PReP Boot! Bydd y gosod yn parhau, "
 "ond i gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1178,12 +1127,12 @@ msgstr ""
 "Rhowch y CD-ROM \"%s\" yn eich gyrrwr a chlicio Iawn ar ôl gorffen\n"
 "Os nad yw gennych, cliciwch Diddymu i beidio a gosod o'r CD-ROM."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Casglu'r pecynnau sydd ar gael..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1192,7 +1141,7 @@ msgstr ""
 "Nid oes gan eich system ddigon o le ar gyfer gosod neu ddiweddaru  (%dMB > %"
 "dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1201,52 +1150,52 @@ msgstr ""
 "Dewiswch lwytho neu gadw pecyn dewiswyd.\n"
 "Mae'r fformat yr un â ffeiliau cynhyrchwyd drwy auto_install."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Llwyth"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Cadw"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Ffeil gwael"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Dewis Bwrdd Gwaith"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Dewiswch broffil bwrdd gwaith eich man gwaith."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Mae'r maint a ddewiswyd yn fwy na'r lle ar gael"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Math o osod"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1255,82 +1204,82 @@ msgstr ""
 "Nid ydych wedi dewis grwpiau o becynnau.\n"
 "Dewiswch y gosod lleiaf rydych ei eisiau"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Gyda X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Gyda dogfennau elfennol (argymell!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Gosod bach iawn (yn arbennig dim urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Paratoi'r gosod"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Gosod pecyn %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Roedd gwall wrth drefnu pecynnau:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Mynd yn eich blaen beth bynnag?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Ceisio eto"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Hepgor y pecyn"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Hepgor pob pecyn o gyfrwng \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Mynd yn ôl at ddewis cyfrwng a phecyn"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Digwyddodd gwall wrth osod pecyn: %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Ffurfweddiad ôl osod"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Gwnewch yn siŵr fod cyfrwng Diweddaru Modiwlau yng ngyrrwr %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Diweddaru"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1351,28 +1300,28 @@ msgstr ""
 "\n"
 "Ydych chi am osod y diweddariadau?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s ar %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Caledwedd"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Cerdyn sain"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "A oes gennych gerdyn sain ISA?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1381,67 +1330,67 @@ msgstr ""
 "Rhedwch \"alsaconf\" neu \"sndconfig\" wedi'r gosodiad i ffurfweddu eich "
 "cerdyn sain"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Heb ganfod cerdyn sain. Ceisiwch \"harddrake\" wedi'r gosodiad"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Rhyngwyneb graffigol"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Rhwydwaith a'r Rhyngrwyd"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Dirprwyon"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "ffurfweddwyd"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Lefel Diogelwch"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Mur Cadarn"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "gweithredwyd"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "anablwyd"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Nid ydych wedi ffurfweddu X. Ydych chi'n siŵr eich bod am wneud hyn?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Paratoi cychwynnwr..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Amynedd, gall hyn gymryd amser..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1454,7 +1403,7 @@ msgstr ""
 "bydd rhaid defnyddio BootX i gychwyn eich peiriant. Ymresymiad y cnewyllyn "
 "ar gyfer y gwraidd yw: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1463,17 +1412,17 @@ msgstr ""
 "Ar y lefel diogelwch yma, mae mynedfa i ffeiliau yn rhaniad Windows wedi eu "
 "cyfyngu i'r Gweinyddwr."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Rhowch ddisg meddal  yng ngyrrwr %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Creu disg meddal awto gosod..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1484,7 +1433,7 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau gorffen?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Llongyfarchiadau"
@@ -1628,6 +1577,30 @@ msgid ""
 "Exit"
 msgstr "Gorffen"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Eich bwrdd gwaith ar allwedd USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Mandriva Linux - y dosbarthiad cod agored 100%%"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Arbrofi rhwydd gyda Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Bwrdd gwaith Mandriva Linux llawn, gyda chefnogaeth"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: dosbarthiad ar gyfer angen pawb"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Llwytho ffeil %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Nid yw diweddaru o ddosbarthiad 32did i 64did yn cael ei gynnal"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Nid yw diweddaru o ddosbarthiad 64did i 32did yn cael ei gynnal"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/da.po b/perl-install/install/share/po/da.po
index 2adb9a56d..f749fe9c9 100644
--- a/perl-install/install/share/po/da.po
+++ b/perl-install/install/share/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-04-04 10:35+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -19,31 +19,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Dit skrivebord på en USB-nøgle"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Den 100%% open source Mandriva Linux distribution"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Udforsk Linux nemt med Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Et fuldt Mandriva Linux skrivebord, med support "
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distributioner der passer til alles behov"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -83,22 +58,24 @@ msgstr "Netværk (FTP)"
 msgid "Network (NFS)"
 msgstr "Netværk (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL på spejlet?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL skal starte med ftp:// eller http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
-msgstr "Kontakter Mandriva Linux netsted for at hente listen over tilgængelige spejle"
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr ""
+"Kontakter Mandriva Linux netsted for at hente listen over tilgængelige spejle"
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -107,69 +84,69 @@ msgstr ""
 "Mislykkedes med at kontakte Mandriva Linux netsted for at hente listen over "
 "tilgængelige spejle"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Vælg det spejl hvorfra pakkerne skal hentes"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-opsætning"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Indtast værtsnavn og katalog for dit NFS-medie"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Værtsmaskinenavn mangler"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Katalog skal begynde med \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Værtsnavn på NFS-monteringen?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Katalog"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Supplerende"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Kan ikke finde hdlist-fil på dette spejl"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Leder efter pakker der allerede er installeret..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Leder efter pakker som skal opgraderes"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Fjerner pakker før opgradering..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -189,18 +166,18 @@ msgstr ""
 "skal du genstarte dit system og opgradere ved brug af Mandriva update "
 "programmet."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Genstart"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Fortsæt"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -213,72 +190,72 @@ msgstr ""
 "\n"
 "Ønsker du virkelig at fjerne disse pakker?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fejl ved læsning af filen %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "De følgende diske blev omdøbt:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (tidligere kaldet %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Netværk"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Vælg et medie"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fil eksisterer allerede. Skal den overskrives?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Adgang nægtet"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Dårligt NFS-navn"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Dårligt medie %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Kan ikke lave øjebliksbilleder før partitionering"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Øjebliksbilleder vil være tilgængelige efter installation i %s"
@@ -289,11 +266,15 @@ msgid "Installation"
 msgstr "Installation"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Konfiguration"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -319,22 +300,22 @@ msgstr "Bringer netværket op"
 msgid "Bringing down the network"
 msgstr "Lukker netværket ned"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Vent venligt, henter fil"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Henter filen %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopierer nogle pakker til disk til fremtidig brug"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiering udføres"
@@ -378,27 +359,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Der er opstået en fejl:"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d installationstransaktioner mislykkedes"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installation af pakker mislykkedes:"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Arbejdsstation"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Kontor-arbejdsstation"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -407,7 +388,7 @@ msgstr ""
 "Kontor-programmer: Tekstbehandling (OpenOffice.org, kword, abiword), "
 "regneark (OpenOffice.org, kspread, gnumeric), pdf-visere, o.lign."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -416,32 +397,32 @@ msgstr ""
 "Kontor-programmer: Tekstbehandler (kword, abiword), regneark (kspread, "
 "gnumeric), pdf-visere, o.lign."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Spillemaskine"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Underholdnings-programmer: arkade, bræt, strategi, osv."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedie-station"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Lyd- og video-afspillere og redigeringsværktøjer"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internet-station"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -450,211 +431,193 @@ msgstr ""
 "Værktøjssæt til at læse samt sende post og nyheder (mutt, tin..) , og til at "
 "browse på nettet"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Netværksmaskine (klient)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienter for forskellige protokoller inklusiv ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Værktøjer til at lette indstillingen af din maskine"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsolværktøjer"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redigeringsværktøjer, skaller, filværktøjer, terminaler"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Udvikling"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C og C++ udviklingsbiblioteker, programmer, og include-filer."
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentation"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Bøger og vejledninger om Linux og Frit Programmel"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Understøttelse for tredjeparts-programmer"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Webserver"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Gruppeprogrammel"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab-server"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Brandmur/ruter"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internetadgang"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Post og nyheder"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix postserver, inn nyhedsserver"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Katalogserver"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-server"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Server for domænenavne (DNS) og netværksinformation (NIS)"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fil- og Printerdelings-server"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS-server, Samba-server"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL og MySQL database-server"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache og Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Post"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix postserver"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL eller MySQL database-server"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Netværksmaskine server"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-vært, SMB-vært, mellemvært (proxy), SSH-vært"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafisk miljø"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-arbejdsstation"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -663,19 +626,19 @@ msgstr ""
 "K Desktop -miljøet, det grundlæggende grafiske miljø, med en vifte af "
 "supplerende værktøjer."
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome-arbejdsstation"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Et grafisk miljø med brugervenlig samling af programmer og værktøjer"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE-skrivebord"
@@ -685,56 +648,56 @@ msgstr "LXDE-skrivebord"
 msgid ""
 "A lightweight & fast graphical environment with user-friendly set of "
 "applications and desktop tools"
-msgstr "Et let og hurtigt grafisk miljø med brugervenlig samling af programmer og skrivebordsværktøjer"
+msgstr ""
+"Et let og hurtigt grafisk miljø med brugervenlig samling af programmer og "
+"skrivebordsværktøjer"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andre grafiske miljøer"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Nytteprogrammer"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-server"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin ekstern konfigurationsserver"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Nytteprogrammer og overvågning af netværk"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Overvågningsværktøjer, proceskontering, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva konfigurationsprogrammer"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Hjæpeprogrammer til at konfigurere server"
@@ -835,17 +798,17 @@ msgstr "Her er et smugkig af '%s' skrivebordet."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klik på billeder for at se et større smugkig"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Valg af pakkegrupper"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuelt pakkevalg"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Total størrelse: %d / %d Mb"
@@ -966,12 +929,12 @@ msgstr ""
 "Administration\n"
 "af programmer"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Vælg pakker som skal installeres"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installerer"
@@ -998,7 +961,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pakke"
 msgstr[1] "%d pakker"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Oversigt"
@@ -1008,7 +971,7 @@ msgstr "Oversigt"
 msgid "Configure"
 msgstr "Konfigurér"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "ikke konfigureret"
@@ -1018,7 +981,7 @@ msgstr "ikke konfigureret"
 msgid "Media Selection"
 msgstr "Valg af pakkemedie"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1027,7 +990,7 @@ msgstr ""
 "De følgende installationsmedier er fundet.\n"
 "Hvis du ønsker at overspringe nogen af dem, kan du fravælge dem nu."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1040,7 +1003,7 @@ msgstr ""
 "Installationen vil så fortsætte fra disken og pakkerne vil forblive "
 "tilgængelige, når systemet er fuldt installeret."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiér hele cd'er"
@@ -1060,59 +1023,49 @@ msgstr "Vælg dit tastaturlayout"
 msgid "Here is the full list of available keyboards:"
 msgstr "Her er den komplette liste over tilgængelige tastaturer:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installér/Opgradér"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Er dette en nyinstallation eller en opgradering?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installation"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Opgradér %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Opgradering fra en 32-bit til en 64-bit distribution er ikke understøttet"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Opgradering fra en 64-bit til en 32-bit distribution er ikke understøttet"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Krypteringsnøgle for %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Afbryd installation, genstart system"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Ny installation"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Opgradér foregående installation (ikke anbefalet)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1133,17 +1086,17 @@ msgstr ""
 "vælger \"Ny\n"
 "Installation\"."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Konfigurerer IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1152,7 +1105,7 @@ msgstr ""
 "Det er ikke plads for 1 MB bootstrap! Installationen vil fortsætte, men for "
 "at starte dit system op, skal du lave en bootstrap partition i DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1162,7 +1115,7 @@ msgstr ""
 "Du skal lave en PPC PReP Boot bootstrap! Installationen vil fortsætte, men "
 "for at starte dit system op, skal du lave bootstrap-partitionen i DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1176,12 +1129,12 @@ msgstr ""
 "Hvis du ikke har den så tryk på Annullér for at undgå installation fra denne "
 "cd."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Leder efter tilgængelige pakker"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1190,7 +1143,7 @@ msgstr ""
 "Dit system har ikke nok plads tilbage til installation eller opgradering (%"
 "dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1199,52 +1152,52 @@ msgstr ""
 "Vælg indlæs eller gem pakkevalg på diskette.\n"
 "Formatet er det samme som for auto_install-genererede filer."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Belastning"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Gem"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Dårlig fil"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Valg af skrivebord"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Du kan vælge profil for skrivebordet for din arbejdsstation: "
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valgt størrelse er større end tilgængelig plads"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Installationstype"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1253,82 +1206,83 @@ msgstr ""
 "Du har ikke valgt nogen gruppe af pakker.\n"
 "Vælg den minimale installation du ønsker"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Med X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med basal dokumentation (anbefalet!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Virkelig minimal installation (specielt ingen urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Forbereder installationen"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Der opstod en fejl ved sorteringen af pakkerne:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Fortsæt alligevel?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Prøv igen"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Overspring denne pakke"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Overspring alle pakker fra medie '%s'"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Gå tilbage til valg af medie og pakker"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Der opstod en fejl ved installeringen af pakke %s"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Konfiguration efter installation"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
-msgstr "Forsikr dig venligst om at mediet med Opdateringsmodulerne er i drev %s"
+msgstr ""
+"Forsikr dig venligst om at mediet med Opdateringsmodulerne er i drev %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Opdateringer"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1348,28 +1302,28 @@ msgstr ""
 "\n"
 "Ønsker du at installere opdateringerne?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Udstyr"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du et ISA-lydkort?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1378,67 +1332,68 @@ msgstr ""
 "Kør \"alsaconf\" eller \"sndconfig\" efter installation for at konfigurere "
 "dit lydkort"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Intet lydkort genkendt. Prøv at køre  \"harddrake\" efter installation"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafisk grænseflade"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Netværk og Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxyer "
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "konfigureret"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Sikkerhedsniveau"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Brandmur"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktiveret"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "deaktiveret"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
-msgstr "Du har ikke konfigureret X. Er du sikker på at du virkelig ønsker dette?"
+msgstr ""
+"Du har ikke konfigureret X. Er du sikker på at du virkelig ønsker dette?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Forbereder opstarter..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Vær tålmodig, dette kan tage et stykke tid..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1451,7 +1406,7 @@ msgstr ""
 "du skal bruge BootX eller en anden måde til at starte din maskine. Kernens "
 "parameter for root-filsystemet er: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1460,17 +1415,17 @@ msgstr ""
 "I dette er sikkerhedsniveau er adgang til Windows-partitionen forbeholdt "
 "administratoren."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Indsæt en tom diskette i drev %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Laver autoinstallations-diskette"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1481,7 +1436,7 @@ msgstr ""
 "\n"
 "Er du sikker på du ønsker du at lukke nu?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Tillykke"
@@ -1625,3 +1580,28 @@ msgid ""
 "Exit"
 msgstr "Afslut"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Dit skrivebord på en USB-nøgle"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Den 100%% open source Mandriva Linux distribution"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Udforsk Linux nemt med Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Et fuldt Mandriva Linux skrivebord, med support "
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distributioner der passer til alles behov"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Henter filen %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Opgradering fra en 32-bit til en 64-bit distribution er ikke understøttet"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Opgradering fra en 64-bit til en 32-bit distribution er ikke understøttet"
diff --git a/perl-install/install/share/po/de.po b/perl-install/install/share/po/de.po
index 8e4b1b94f..99d4d56dc 100644
--- a/perl-install/install/share/po/de.po
+++ b/perl-install/install/share/po/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-04-05 10:50+0200\n"
 "Last-Translator: Oliver Burger <oliver@mandrivauser.de>\n"
 "Language-Team: deutsch <cooker-i18n@mandrivalinux.org>\n"
@@ -29,31 +29,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Ihr Desktop auf einem USB-Stick"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Die 100%% Open Source Mandriva Linux Distribution"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Linux problemlos entdecken mit Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Ein vollständiger Mandriva Linux Desktop mit Unterstützung"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: Distributionen für alle Anforderungen"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -94,24 +69,25 @@ msgstr "Netzwerk (FTP)"
 msgid "Network (NFS)"
 msgstr "Netzwerk (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL der Spiegel?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Die URL muss mit ftp:// oder http:// beginnen"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "Kontaktiere Mandriva Linux Web-Server, um eine Liste verfügbarer Pakete zu "
 "erhalten..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -120,69 +96,70 @@ msgstr ""
 "Kontaktieren Sie die Mandriva Linux Webseiten, um eine Liste verfügbaren "
 "Mirrors zu erhalten"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Bitte wählen Sie einen Mirror, von dem Sie die Pakete holen wollen."
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-Einrichtungsetup"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
-msgstr "Bitte geben Sie den Rechnernamen und das Verzeichnis ihres NFS-Mediums ein"
+msgstr ""
+"Bitte geben Sie den Rechnernamen und das Verzeichnis ihres NFS-Mediums ein"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Hostname fehlt"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Verzeichnis muss mit \"/\" beginnen"
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Rechnername der NFS-Einbindung?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Ergänzend"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Kann die Datei hdlist nicht auf diesem Spiegel finden"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Suche nach bereits installierten Paketen ..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Finde die zu aktualisierenden Pakete ..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Entferne Pakete vor der Aktualisierung..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -204,18 +181,18 @@ msgstr ""
 "starten Sie Ihr System neu und aktualisieren Sie mit Hilfe von "
 "MandrivaUpdate."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Neustart"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Fortfahren"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -229,72 +206,72 @@ msgstr ""
 "\n"
 "Wollen Sie diese Pakete wirklich entfernen?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fehler beim Lesen der Datei %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Die folgenden Datenträger wurden umbenannt:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (vorher als %s bezeichnet)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Netzwerk"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Bitte wählen Sie ein Medium"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Die Datei existiert bereits. Überschreiben?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Falscher NFS-Name"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Mediumfehler %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Vor der Partitionierung kann ich keine Screenshots machen."
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Die Screenshots liegen nach der Installation unter „%s“"
@@ -305,11 +282,15 @@ msgid "Installation"
 msgstr "Installation"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Konfiguration"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -334,22 +315,22 @@ msgstr "Netzwerkverbindung herstellen"
 msgid "Bringing down the network"
 msgstr "Netzwerkverbindung trennen"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Bitte warten, Datei wird empfangen"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Lade Datei %s herunter..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Pakete auf die Festplatte speichern für die spätere Verwendung"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Dateien werden kopiert"
@@ -393,27 +374,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Ein Fehler ist aufgetreten:"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d Installation schlug fehl"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installieren der Pakete ist fehlgeschlagen:"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Arbeitsplatzrechner"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Büro-Arbeitsplatz"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -422,7 +403,7 @@ msgstr ""
 "Office-Programme: Textverarbeitung (Openoffice.org Writer, KWord), "
 "Tabellenkalkulation (OpenOffice.org Calc, KSpread), PDF-Betrachter, usw."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -431,32 +412,32 @@ msgstr ""
 "Office-Programme: Textverarbeitung (KWord, Abiword), Tabellenkalkulation "
 "(KSpread, Gnumeric), PDF-Betrachter, usw."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Spiele-Station"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Spiele: Arcade-, Brett-, Strategiespiele, usw."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedia-Station"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programme, um Sound und Video abzuspielen und zu bearbeiten"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internet-Station"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -465,211 +446,193 @@ msgstr ""
 "Programme um E-Mails und News zu lesen und zu versenden (pine, mutt, tin..) "
 "und um im Internet zu surfen"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Netzwerk-Computer (Client)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients für verschiedene Protokolle, u.a. SSH"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Werkzeuge, die die Konfiguration Ihres Computers erleichtern"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsolen-Werkzeuge"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editoren, Shells, Dateiwerkzeuge, Konsolen"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Entwicklung"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C und C++ Entwicklungsbibliotheken, Programme und Include-Dateien"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentation"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Bücher und HOWTOs zu GNU/Linux und Freier Software"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux-Standard-Base. Drittanbieterunterstützung"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Webserver"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab-Server"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Firewall / Router"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet-Gateway"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "E-Mail/News"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix Mail-Server, Inn News-Server"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Verzeichnisdienst"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-Server"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domänennamen- und Netzwerk-Informations-Server"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Datei- und Druckerserver"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS-Server, Samba Server"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Datenbank"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL und MySQL-Datenbankserver"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Email"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix Mail-Server"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL oder MySQL-Datenbankserver"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Netzwerkrechner-Server"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-Server, SMB-Server, Proxy-Server, SSH-Server"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafische Arbeitsoberfläche"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-Arbeitsplatz"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -678,19 +641,20 @@ msgstr ""
 "Die K-Desktop-Umgebung, die Standard-Arbeitsfläche mit einer Sammlung "
 "zugehöriger Programme"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome-Arbeitsplatz"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
-msgstr "Eine grafische Umgebung mit anwenderfreundlichen Anwendungen und Werkzeugen"
+msgstr ""
+"Eine grafische Umgebung mit anwenderfreundlichen Anwendungen und Werkzeugen"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE-Desktop"
@@ -700,56 +664,56 @@ msgstr "LXDE-Desktop"
 msgid ""
 "A lightweight & fast graphical environment with user-friendly set of "
 "applications and desktop tools"
-msgstr "Eine leichtgewichtige und schnelle grafische Umgebung mit anwenderfreundlichen Anwendungen und Werkzeugen"
+msgstr ""
+"Eine leichtgewichtige und schnelle grafische Umgebung mit "
+"anwenderfreundlichen Anwendungen und Werkzeugen"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andere grafische Arbeitsflächen"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, usw."
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Werkzeuge"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-Server"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin Fernkonfigurationsserver"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Netzwerkwerkzeuge/-überwachung"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Überwachungswerkzeuge, Prozessverwaltung, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva-Assistenten"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Assistenten zur Servereinrichtung"
@@ -850,17 +814,17 @@ msgstr "Hier sehen Sie eine Vorschau des '%s' Desktops"
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klicken Sie auf die Bilder, um größere Vorschauen zu erhalten"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Auswahl der Paketgruppen"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuelle Paketauswahl"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Gesamtgröße: %d / %d MB"
@@ -983,12 +947,12 @@ msgstr "Minimal-Installation"
 msgid "Software Management"
 msgstr "Software verwalten"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Zu installierende Pakete auswählen"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installation"
@@ -1015,7 +979,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d Paket"
 msgstr[1] "%d Pakete"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Zusammenfassung"
@@ -1025,7 +989,7 @@ msgstr "Zusammenfassung"
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "Nicht eingerichtet"
@@ -1035,7 +999,7 @@ msgstr "Nicht eingerichtet"
 msgid "Media Selection"
 msgstr "Auswahl der Installationsmedien"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1044,7 +1008,7 @@ msgstr ""
 "Die folgenden Installationsmedien wurden gefunden.\n"
 "Wählen Sie die Medien ab, die Sie überspringen wollen."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1057,7 +1021,7 @@ msgstr ""
 "fortgeführt und die Softwarepakete bleiben verfügbar, nachdem das System "
 "fertig installiert ist."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiere die CDs"
@@ -1077,59 +1041,49 @@ msgstr "Bitte wählen Sie Ihren Tastaturtyp"
 msgid "Here is the full list of available keyboards:"
 msgstr "Komplette Liste aller verfügbarer Tastaturlayouts"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installation/Aktualisierung"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Handelt es sich um eine Installation oder eine Aktualisierung?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installation"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Aktualisiere %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Upgrade von einem 32bit System auf ein 64bit System wird nicht unterstützt"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Upgrade von einem 64bit System auf ein 32bit System wird nicht unterstützt"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Schlüssel für %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Installation abbrechen, das System neustarten"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Neuinstallation"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Vorhergehende Installation aktualisieren (nicht empfohlen)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1148,17 +1102,17 @@ msgstr ""
 "Warnung: Sie sollten all Ihre persönlichen Daten sichern, bevor Sie \"Neu\n"
 " Installation\" wählen."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE konfigurieren"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1168,7 +1122,7 @@ msgstr ""
 "Installation wird fortgesetzt, Sie müssen jedoch eine Start-Partition mit "
 "DiskDrake erstellen."
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1178,7 +1132,7 @@ msgstr ""
 "Sie müssen einen PPC PReP Boot Lader erzeugen! Die Installation wird "
 "fortgesetzt, Sie müssen jedoch eine Start-Partition mit DiskDrake erstellen."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1190,12 +1144,12 @@ msgstr ""
 "Bitte legen Sie die CD-ROM „%s“ in Ihr Laufwerk. Drücken Sie dann auf „OK“.\n"
 "Falls Sie sie nicht vorliegen haben, drücken Sie auf „Abbrechen“."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Suche nach vorhandenen Paketen..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1204,7 +1158,7 @@ msgstr ""
 "Das System hat für die Installation oder das Update nicht genug freien "
 "Speicher (%dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1214,52 +1168,52 @@ msgstr ""
 "gespeichert werden soll. Es handelt sich um das gleiche\n"
 "Format, wie die unter „auto_install“ erzeugten Disketten."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Last"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Speichern"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Datei fehlerhaft"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Auswahl der Desktopumgebung"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Sie haben die Wahl zwischen verschiedenen Desktopprofilen."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Gewünschte Größe übersteigt den verfügbaren Platz"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Installationstyp"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1268,84 +1222,84 @@ msgstr ""
 "Sie haben keine Paketgruppe ausgewählt.\n"
 "Bitte wählen Sie die minimale Installation, die Sie wünschen."
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Mit X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Mit minimaler Dokumentation (Empfohlen)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Extrem minimale Installation (ohne „urpmi“)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Bereite Installation vor"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Installiere Paket %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Bei der Anforderung folgender Pakete trat ein Fehler auf:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Wollen Sie trotzdem fortfahren?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Dieses Paket überspringen"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Überspringe alle Pakete von dem Medium \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Zurück zu den Medien und zur Paketauswahl"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Bei der Installation des Paketes%s trat ein Fehler auf."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Bereite weitere Konfiguration vor ..."
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Bitte stellen Sie sicher, dass sich das Update-Modul-Medium im Laufwerk %s "
 "befindet"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Aktualisierungen"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1365,28 +1319,28 @@ msgstr ""
 "\n"
 "Möchten Sie die Aktualisierungen vornehmen?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s auf %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Soundkarte"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Verfügen Sie über eine ISA-Soundkarte?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1395,69 +1349,69 @@ msgstr ""
 "Starten Sie „sndconfig“ oder „alsaconf“ nach der Installation, um Ihre "
 "Soundkarte einzurichten."
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Es wurde keine Soundkarte gefunden. Versuchen Sie „harddrake“ nach der "
 "Installation."
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafikumgebung"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Netzwerk & Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxies"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "konfiguriert"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Sicherheitsebene"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktiviert"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Sie haben X nicht konfiguriert. Sind Sie sicher?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Bereite Bootloader vor ..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Ein wenig Geduld, dies kann eine Zeit lang brauchen..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1471,7 +1425,7 @@ msgstr ""
 "müssen um Ihren Rechner zu starten. Der Kernelparameter für das Root-"
 "Dateisystem ist: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1480,17 +1434,17 @@ msgstr ""
 "In dieser Sicherheitseinstellung ist der Zugriff auf Datein der "
 "Windowspartition nur dem Administrator erlaubt"
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Legen Sie eine leere Diskette in das %s ein."
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Erstelle eine Auto-Installationsdiskette"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1501,7 +1455,7 @@ msgstr ""
 "\n"
 "Wollen Sie DrakX wirklich beenden?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Herzlichen Glückwunsch!"
@@ -1645,3 +1599,28 @@ msgid ""
 "Exit"
 msgstr "Verlassen"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Ihr Desktop auf einem USB-Stick"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Die 100%% Open Source Mandriva Linux Distribution"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Linux problemlos entdecken mit Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Ein vollständiger Mandriva Linux Desktop mit Unterstützung"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: Distributionen für alle Anforderungen"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Lade Datei %s herunter..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Upgrade von einem 32bit System auf ein 64bit System wird nicht unterstützt"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Upgrade von einem 64bit System auf ein 32bit System wird nicht unterstützt"
diff --git a/perl-install/install/share/po/el.po b/perl-install/install/share/po/el.po
index f03854576..e80dcc278 100644
--- a/perl-install/install/share/po/el.po
+++ b/perl-install/install/share/po/el.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-04-02 13:26+0200\n"
 "Last-Translator: Glentadakis Dimitrios <dglent@gmail.com>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -23,31 +23,6 @@ msgstr ""
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Το προσωπικό σου σύστημα εργασίας σε ένα USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Η 100%% ανοιχτού κώδικα, διανομή του Mandriva Linux"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Εξερεύνησε το Λίνουξ, εύκολα, με το Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Ένα πλήρες σύστημα desktop Mandriva Linux, με υποστήριξη"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: συστήματα Λίνουξ για όλες τις χρήσεις"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -87,17 +62,17 @@ msgstr "Δίκτυο (FTP)"
 msgid "Network (NFS)"
 msgstr "Δίκτυο (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Το URL της εναλλακτικής διεύθυνσης;"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Το URL πρέπει να ξεκινά με ftp:// ή http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -105,7 +80,7 @@ msgstr ""
 "Σύνδεση με την τοποθεσία της Mandriva Linux, για λήψη της λίστας με τις "
 "εναλλακτικές διευθύνσεις..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -114,49 +89,49 @@ msgstr ""
 "Αδυναμία σύνδεσης με την τοποθεσία της Mandriva Linux, για λήψη της λίστας "
 "με τις εναλλακτικές διευθύνσεις"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Επιλέξτε τόπο από τον οποίο θα γίνει η λήψη πακέτων"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "Ρύθμιση NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 "Παρακαλώ, εισήγαγε το hostname (οικοδεσπότη υπολογιστή) και τη διαδρομή του "
 "μέσου NFS"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Λείπει ο hostname (οικοδεσπότης υπολογιστής)"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Ο κατάλογος πρέπει να αρχίζει με \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Ο hostname (οικοδεσπότης υπολογιστής) της NFS προσάρτησης ;"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Κατάλογος"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Συμπληρωματικά"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -165,22 +140,22 @@ msgstr ""
 "Δεν βρέθηκε το αρχείο με την λίστα των πακέτων σε αυτόν τον mirror. "
 "Σιγουρευτείτε ότι η τοποθεσία είναι σωστή."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ψάχνω για ήδη εγκατεστημένα πακέτα..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Αναζήτηση πακέτων προς αναβάθμιση..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Αφαίρεση των πακέτων, πριν την αναβάθμιση..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -200,18 +175,18 @@ msgstr ""
 "παρακαλώ επανεκκινήστε τον υπολογιστή σας και κάντε την αναβάθμιση από την "
 "εφαρμογή ενημέρωσης του συστήματος Mandriva."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Επανεκκίνηση"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Συνέχεια"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -224,72 +199,72 @@ msgstr ""
 "\n"
 "Θέλετε πραγματικά να αφαιρέστε αυτά τα πακέτα;\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Έγινε αλλαγή των ονομάτων των παρακάτω πακέτων:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (προηγουμένως ονομαζόταν %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Δίκτυο"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Παρακαλώ, επέλεξε ένα μέσο"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Το αρχείο υπάρχει ήδη. Να αντικατασταθεί;"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Δεν δόθηκε άδεια"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Λανθασμένο όνομα NFS"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Εσφαλμένο μέσο %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Αδύνατη η λήψη στιγμιοτύπων πριν από την δημιουργία κατατμήσεων"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Τα στιγμιότυπα θα είναι διαθέσιμα μετά την εγκατάστασης στο %s"
@@ -300,11 +275,15 @@ msgid "Installation"
 msgstr "Εγκατάσταση"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Ρύθμιση"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -331,22 +310,22 @@ msgid "Bringing down the network"
 msgstr "Διακοπή λειτουργίας δικτύου"
 
 # ????
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Παρακαλώ περιμένετε, γίνεται αναζήτηση του αρχείου"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Λήψη αρχείου %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Αντιγραφή κάποιων πακέτων στο δίσκο, για μελλοντική χρήση"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Αντιγραφή σε εξέλιξη"
@@ -385,30 +364,32 @@ msgstr ""
 "Κάποια πακέτα που ζητήθηκαν από το %s, δεν μπορούν να εγκατασταθούν:\n"
 "%s"
 
-#: pkgs.pm:313, c-format
+#: pkgs.pm:313
+#, c-format
 msgid "An error occurred:"
 msgstr "Προκλήθηκε σφάλμα :"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "Η %d συναλλαγή εγκατάστασης απέτυχε"
 
-#: pkgs.pm:777, c-format
+#: pkgs.pm:781
+#, c-format
 msgid "Installation of packages failed:"
 msgstr "Η εγκατάσταση των πακέτων απέτυχε :"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Σταθμός Εργασίας"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Σταθμός Εργασίας Γραφείου"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -417,7 +398,7 @@ msgstr ""
 "Εργαλεία γραφείου: Επεξεργαστές κειμένου(OpenOffice.org Writer, Kword), "
 "λογιστικά φύλλα (OpenOffice.org Calc, Kspread), αρχεία pdf κλπ"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -426,32 +407,32 @@ msgstr ""
 "Εργαλεία γραφείου: Επεξεργαστές κειμένου(kword, abiword), λογιστικά φύλλα "
 "(kspread, gnumeric), αρχεία pdf κλπ"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Σταθμός παιχνιδιών"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Διασκέδαση (παιχνίδια)"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Σταθμός πολυμέσων"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Προγράμματα αναπαραγωγής και διαχείρισης video και ήχου"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Σταθμός Διαδικτύου"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -460,236 +441,219 @@ msgstr ""
 "Εργαλεία για αποστολή και λήψη αλληλογραφίας και ειδήσεων (mutt, tin...) και "
 "περιήγηση στο Διαδίκτυο"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Υπολογιστής Δικτύου (πελάτης)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Πελάτες για διαφορετικά πρωτόκολλα συμπεριλαμβανομένου του ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Εργαλεία για διευκόλυνση της ρύθμισης του υπολογιστή σας"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Εργαλεία Κονσόλας"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Επεξεργαστές κειμένου, κελύφη, εργαλεία αρχείων, τερματικά"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Ανάπτυξη"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Βιβλιοθήκες ανάπτυξης C και C++, προγράμματα και άλλα αρχεία"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Τεκμηρίωση"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Βιβλία και οδηγοί για το Linux και το Ελεύθερο Λογισμικό"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Υποστήριξη εφαρμογών τρίτων"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Εξυπηρετητής Ιστοσελίδων"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Εξυπηρετητής του Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Τοίχος Προστασίας/Δρομολογητής"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Πύλη Διαδικτύου"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Αλληλογραφία/Νέα"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix server ταχυδρομείου, Inn server ειδήσεων"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Εξυπηρετητής Καταλόγων"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Διακομιστής FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Εξυπηρετητής Όνομα Τομέα και Πληροφοριών Δικτύου"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Εξυπηρετητής Κοινής Χρήσης Αρχείων και Εκτυπώσεων"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Εξυπηρετητής NFS, εξυπηρετητής Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Βάση Δεδομένων"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL και MySQL Database Server"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Ταχυδρομείο"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Εξυπηρετητής ταχυδρομείου Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "Εξυπηρετητής βάσης δεδομένων PostgreSQL ή MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Εξυπηρετητής δικτύου"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 "εξυπηρετητής NFS, εξυπηρετητής SMB, εξυπηρετητής Proxy, εξυπηρετητής ssh"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Γραφικό Περιβάλλον"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "Σταθμός εργασίας KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "Το περιβάλλον γραφείου KDE με μια συλλογή συνοδευτικών εργαλείων"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Σταθμός Εργασίας Gnome"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Γραφικό περιβάλλον με φιλικά εργαλεία και εφαρμογές"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE Γραφικό Περιβάλλον Εργασίας"
 
-#: share/meta-task/compssUsers.pl:147, c-format
+#: share/meta-task/compssUsers.pl:147
+#, c-format
 msgid ""
 "A lightweight & fast graphical environment with user-friendly set of "
 "applications and desktop tools"
@@ -697,54 +661,52 @@ msgstr ""
 "Ένα ελαφρύ & γρήγορο γραφικό περιβάλλον με ένα σύνολο φιλικών εργαλείων και "
 "εφαρμογών"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Άλλα γραφικά περιβάλλοντα"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, κλπ"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Εργαλεία"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "Εξυπηρετητής SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin Server Απομακρυσμένης Ρύθμισης"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Εργαλεία Δικτύου/Παρακολούθηση"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Εργαλεία παρακολούθησης, απολογισμός διεργασιών, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Οδηγοί Ρυθμίσεων Mandriva"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Οδηγοί για τη ρύθμιση εξυπηρετητή"
@@ -847,17 +809,17 @@ msgstr "Αυτή είναι μία προεπισκόπηση του γραφι�
 msgid "Click on images in order to see a bigger preview"
 msgstr "Κάνε κλικ στις εικόνες, για να δεις τη μεγαλύτερη προεπισκόπηση"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Επιλογή Ομάδων από Πακέτα"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Επιλογή ξεχωριστών πακέτων"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Συνολικό μέγεθος: %d / %d MB"
@@ -975,12 +937,12 @@ msgstr "Ελάχιστη Εγκατάσταση"
 msgid "Software Management"
 msgstr "Διαχείριση Λογισμικού"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Επιλέξτε τα πακέτα που θέλετε να εγκαταστήσετε"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Εγκατάσταση"
@@ -1007,7 +969,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d πακέτο"
 msgstr[1] "%d πακέτα"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Περίληψη"
@@ -1017,7 +979,7 @@ msgstr "Περίληψη"
 msgid "Configure"
 msgstr "Ρύθμιση"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "δεν ρυθμίστηκε"
@@ -1027,7 +989,7 @@ msgstr "δεν ρυθμίστηκε"
 msgid "Media Selection"
 msgstr "Επιλογή Μέσου"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1036,7 +998,7 @@ msgstr ""
 "Βρέθηκαν τα ακόλουθα μέσα εγκατάστασης.\n"
 "Αν θες να παραλειφθούν κάποια από αυτά, μπορείς να τα αποεπιλέξεις τώρα."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1049,7 +1011,7 @@ msgstr ""
 "Η οποία θα συνεχιστεί από τον σκληρό δίσκο και τα πακέτα θα μείνουν "
 "διαθέσιμα και μετά το τέλος της εγκατάστασης."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Αντιγραφή ολόκληρων CD"
@@ -1069,17 +1031,17 @@ msgstr "Παρακαλώ επέλεξε τη διάταξη του πληκτρ�
 msgid "Here is the full list of available keyboards:"
 msgstr "Αυτή είναι η πλήρης λίστα με τα διαθέσιμα πληκτρολόγια:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Εγκατάσταση/Αναβάθμιση"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Πρόκειται για εγκατάσταση ή για αναβάθμιση;"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
@@ -1088,42 +1050,32 @@ msgstr ""
 "_: Αυτό είναι ένα ουσιαστικό:\n"
 "Εγκατάσταση"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Αναβάθμιση %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Η αναβάθμιση της διανομής από 32bit σε 64bit δεν υποστηρίζεται "
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Η αναβάθμιση της διανομής από 64bit σε 32bit δεν υποστηρίζεται"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Κλειδί κρυπτογράφησης για το %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Ακύρωση της εγκατάστασης, επανεκκίνηση του συστήματος"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Νέα εγκατάσταση"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Αναβάθμιση προηγούμενης εγκατάστασης (δεν συστήνεται)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1145,17 +1097,17 @@ msgstr ""
 "σου\n"
 "δεδομένα και τα έγγραφα πριν επιλέξεις τη \"Νέα Εγκατάσταση\"."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Ρύθμιση IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1165,7 +1117,7 @@ msgstr ""
 "αλλά για να ξεκινήσετε το σύστημά σας, θα χρειαστεί να δημιουργήσετε μια "
 "κατάτμηση bootstrap με το DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1176,7 +1128,7 @@ msgstr ""
 "εγκατάσταση θα συνεχιστεί, αλλά για να εκκινήσετε το σύστημά σας, θα πρέπει "
 "να δημιουργήσετε την κατάτμηση έναρξης από το DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1191,12 +1143,12 @@ msgstr ""
 "Εάν δεν το έχετε, πατήστε Ακύρωση για αποφυγή εγκατάστασης από αυτό το Cd-"
 "Rom."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Ψάχνω για διαθέσιμα πακέτα..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1205,7 +1157,7 @@ msgstr ""
 "Το σύστημά σας δεν έχει αρκετό ελεύθερο χώρο για την εγκατάσταση ή την "
 "αναβάθμιση (%dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1215,54 +1167,54 @@ msgstr ""
 "πακέτα.\n"
 "Η μορφή είναι η ίδια με τα αρχεία auto_install (αυτόματης εγκατάστασης)."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Φόρτος"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Λανθασμένο αρχείο"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Επιλογή Γραφικού Περιβάλλοντος Εργασίας"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 "Μπορείς να επιλέξεις το προφίλ για το γραφικό περιβάλλον εργασίας του "
 "υπολογιστή σου."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Το επιλεγμένο μέγεθος είναι μεγαλύτερο από το διαθέσιμο χώρο"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Τύπος εγκατάστασης"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1271,84 +1223,84 @@ msgstr ""
 "Δεν έχετε επιλέξει κάποια ομάδα πακέτων.\n"
 "Παρακαλώ επιλέξτε την ελάχιστη εγκατάσταση που θέλετε:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Με Χ"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Με την βασική τεκμηρίωση (συνιστάται!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Πραγματικά ελάχιστη εγκατάσταση (ειδικά χωρίς urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Προετοιμασία της εγκατάστασης"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Εγκατάσταση του πακέτου %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Προκλήθηκε σφάλμα κατά την ταξινόμηση των πακέτων:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Να συνεχίσω;"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Προσπάθησε ξανά"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Παράβλεψη αυτού του πακέτου"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Παράβλεψη όλων των πακέτων από το μέσο \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Επιστροφή στην επιλογή μέσων και πακέτων"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Προκλήθηκε σφάλμα κατά την εγκατάσταση του πακέτου %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Ρυθμίσεις μετά την εγκατάσταση"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Παρακαλώ σιγουρευτείτε ότι το μέσο ενημέρωσης των οδηγών (modules) είναι "
 "μέσα στην συσκευή %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Ενημερώσεις"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1370,28 +1322,28 @@ msgstr ""
 "\n"
 "Θέλετε να εγκαταστήσετε τις αναβαθμίσεις ;"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s σε %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Υλικό"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Κάρτα ήχου"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Έχετε κάρτα ήχου ISA;"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1400,69 +1352,69 @@ msgstr ""
 "Εκτέλεσε την εντολή \"alsaconf\" ή \"sndconfig\", μετά την εγκατάσταση, για "
 "να ρυθμίσεις την κάρτα ήχου"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Δεν βρέθηκε κάρτα ήχου. Δοκιμάστε το \"harddrake\" μετά την εγκατάσταση"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Γραφικό περιβάλλον"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Δίκτυο & Διαδίκτυο"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Διαμεσολαβητές (proxies)"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "ρυθμισμένο"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Επίπεδο Ασφαλείας"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Τοίχος Προστασίας"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "ενεργοποιημένο"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "απενεργοποιημένο"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Δεν έχετε ρυθμίσει το Χ. Είστε βέβαιοι ότι θέλετε να το κάνετε;"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Προετοιμασία του προγράμματος εκκίνησης..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 "Παρακαλώ περιμένετε, η διαδικασία θα διαρκέσει κάποιο χρονικό διάστημα ..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1476,7 +1428,7 @@ msgstr ""
 "θα χρειαστεί να χρησιμοποιήσετε το BootX ή μια άλλη μέθοδο για να ξεκινήσετε "
 "το μηχάνημά σας. Η παράμετρος για το root fs είναι: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1485,17 +1437,17 @@ msgstr ""
 "Σε αυτό το επίπεδο ασφαλείας, η πρόσβαση στα αρχεία στην κατάτμηση των "
 "windows περιορίζεται μόνο για τον διαχειριστή."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Εισάγετε άδεια δισκέτα στον οδηγό %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Δημιουργία δισκέτας αυτόματης εγκατάστασης..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1506,7 +1458,7 @@ msgstr ""
 "\n"
 "Θέλετε σίγουρα να εγκαταλείψετε τώρα;"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Συγχαρητήρια"
@@ -1650,6 +1602,30 @@ msgid ""
 "Exit"
 msgstr "Έξοδος"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Το προσωπικό σου σύστημα εργασίας σε ένα USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Η 100%% ανοιχτού κώδικα, διανομή του Mandriva Linux"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Εξερεύνησε το Λίνουξ, εύκολα, με το Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Ένα πλήρες σύστημα desktop Mandriva Linux, με υποστήριξη"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: συστήματα Λίνουξ για όλες τις χρήσεις"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Λήψη αρχείου %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Η αναβάθμιση της διανομής από 32bit σε 64bit δεν υποστηρίζεται "
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Η αναβάθμιση της διανομής από 64bit σε 32bit δεν υποστηρίζεται"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/eo.po b/perl-install/install/share/po/eo.po
index 7ad313ce1..29aa81534 100644
--- a/perl-install/install/share/po/eo.po
+++ b/perl-install/install/share/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2007-12-29 05:55+0100\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -19,31 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -83,17 +58,17 @@ msgstr "Reto (FTP)"
 msgid "Network (NFS)"
 msgstr "Reto (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL de la spegulo?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL devas komenci per ftp:// aŭ http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -101,7 +76,7 @@ msgstr ""
 "Mi kontaktas la Mandriva Linuksan retpaĝon por havigi la liston de "
 "disponeblaj speguloj..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -110,47 +85,47 @@ msgstr ""
 "Mi malsukcesis kontakti la Mandriva Linuksan retpaĝon por havigi la liston "
 "de disponeblaj speguloj..."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Elektu spegulon de kiu havigi la pakaĵojn"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-agordo"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Bonvole enigu la nomon kaj dosierujon de via NSF-datenportilo"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Nomo mankas"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Dosierujo devas komenci per \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Nomo de la NFS surmeto?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Dosierujo"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Kroma"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -159,22 +134,22 @@ msgstr ""
 "Mi ne trovas pakaĵlistan dosieron sur tiu spegulo. Certiĝu ke la adreso "
 "estas ĝusta."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Rigardante jam instalitajn pakaĵojn..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Trovadas pakaĵojn por promocii"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Mi forigas pakaĵojn antaŭ ol ĝisdatigi..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -186,18 +161,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Restarto"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -210,72 +185,72 @@ msgstr ""
 "\n"
 "Ĉu vi vere deziras forigi tiujn pakaĵojn?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, fuzzy, c-format
 msgid "Error reading file %s"
 msgstr "Mi deŝutas dosieron %s..."
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "La sekva(j) disko(j) estas alinomitaj:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (antaŭe nomitaj kiel %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Reto"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Bonvole elektu datenportilon"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Dosiero jam ekzistas.  Ĉu surskribi ĝin?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Permeso rifuzita"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Malĝusta NFS-nomo"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Malbona datenportilo %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Mi ne povas fari ekranfotojn antaŭ ol subdiskigi"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ekranfotoj haveblos post instalado en %s"
@@ -286,11 +261,15 @@ msgid "Installation"
 msgstr "Instalado"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurado"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -316,22 +295,22 @@ msgstr "Startado de la reto"
 msgid "Bringing down the network"
 msgstr "Haltas de la reto"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Mi deŝutas dosieron %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Mi kopias kelkajn pakaĵojn sur diskoj por estonta uzo"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Mi estas kopianta"
@@ -375,27 +354,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Eraro okazis"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instal-transakcioj malsukcesis"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Instalanta pakaĵo %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Laborstacio"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Oficeja laborstacio"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -404,7 +383,7 @@ msgstr ""
 "Oficejaj programoj: tekstiloj (OpenOffice.org Writer, Verkilo [Kword]), "
 "tabelkalkuliloj (OpenOffice.org Calc, Kspread), PDF-vidigiloj, ktp."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -413,32 +392,32 @@ msgstr ""
 "Oficej-programoj: tekstiloj (Verkilo [kword], aboword), tabelkalkuliloj "
 "(kspread, gnumeric), pdf-vidigiloj, ktp."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Ludstacio"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Amuz-programoj: arcade, tabuloj [boards], strategio, ktp."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Plurmediaj stacio"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programoj por ludi/prilabori son- kaj video-programojn"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Interreta stacio"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -447,230 +426,212 @@ msgstr ""
 "Agordiloj por legi kaj sendi retpoŝt-mesaĝojn kaj novaĵojn (mutt, tin...) "
 "kaj por krozi tra la ttt"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Reta computilo (kliento)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klientoj por diversaj protokoloj inklude de ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Iloj por faciligi la konfiguradon de via komputilo"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsoliloj"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktiloj, ŝeloj, dosieriloj, terminaloj"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Programado"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C kaj C++ programadaj bibliotekoj, programoj kaj ĉapdosieroj"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentaro"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Libroj kaj Kielfari pri Linukso kaj libera programaro"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Subteno por triaflankaj aplikaĵoj"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Interret-servilo"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Grupa programaro"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Servilo"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Fajroŝirmilo/enkursigilo"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Interreta kluzo"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Poŝto/Novaĵoj"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix poŝta servilo, Inn novaĵaj servilo"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Dosierujo-servilo"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP Servilo"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domajn-noma kaj ret-informa servilo"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Dosier- kaj printil-kundivida servilo"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS servilo, Samba servilo"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Datumbazoj"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Datenbaz-serviloj PostgreSQL kaj MySQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "TTT/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Poŝto"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix poŝta servilo"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "Datenbaz-servilo PostgreSQL aŭ MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Reta computilo (servilo)"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-servilo, SMB-servilo, prokur-servilo, ssh-servilo"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafika medio"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE Laborstacio"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "La tabula medio K, la baza grafika medio kun kolekto da akompanaj iloj"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnoma Laborstacio"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Grafika medio kun uzfacila aplikaĵaro kaj tabul-iloj"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Labortabulo IceWm"
@@ -682,54 +643,52 @@ msgid ""
 "applications and desktop tools"
 msgstr "Grafika medio kun uzfacila aplikaĵaro kaj tabul-iloj"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Aliaj grafikaj labortabuloj"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, ktp."
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Iloj"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH servilo"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Servilo de fora konfigurado Webmin"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Retaj utilaĵoj/monitorado"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Monitoriloj, proces-kalkuliloj, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Sorĉiloj de Mandriva"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Sorĉiloj por konfiguri servilon"
@@ -829,17 +788,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Elektado de Pakaĵaj Grupoj"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Elektado de individuaj pakaĵoj"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Tuta grandeco: %d / %d MB"
@@ -958,12 +917,12 @@ msgstr "Minimuma instalado"
 msgid "Software Management"
 msgstr "Programar-mastrumilo"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Elektu la pakaĵojn kiuj vi deziras instali"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalanta"
@@ -990,7 +949,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pakaĵo"
 msgstr[1] "%d pakaĵoj"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Resumo"
@@ -1000,7 +959,7 @@ msgstr "Resumo"
 msgid "Configure"
 msgstr "Konfiguru"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "ne konfigurita"
@@ -1010,7 +969,7 @@ msgstr "ne konfigurita"
 msgid "Media Selection"
 msgstr "Elektado de Pakaĵaj Grupoj"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1019,7 +978,7 @@ msgstr ""
 "La sekva instal-datenportilo(j) estas trovita(j).\n"
 "Se vi deziras transsalti kelkajn de ili, vi povas tiujn nun malselekti."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1032,7 +991,7 @@ msgstr ""
 "Tiam la instalado daŭrigas el la fiksdisko kaj la pakaĵoj restos atingeblaj "
 "post kiam la sistemo estos plene instalita."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopii kompletajn KD-ojn"
@@ -1052,59 +1011,49 @@ msgstr "Bonvole elektu vian klavar-aranĝon"
 msgid "Here is the full list of available keyboards:"
 msgstr "Jen la kompleta listo de disponeblaj klavaroj"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalado/Ĝisdatigo"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Ĉu tiu ĉi estas instalado aŭ ĝisdatigo?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalado"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Ĝisdatigu %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Ĝisdatigo de 32-bita al 64-bita eldono ne estas subtenata"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Ĝisdatigo de 64-bita al 32-bita eldono ne estas subtenata"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Ĉifroŝlosilo por %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Instalado"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1116,17 +1065,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Konfiguras IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1135,7 +1084,7 @@ msgstr ""
 "Ne libera spaco por 1mb-startparto! La instalado daurigos, sed por startigi "
 "vian sistemon, vi devos krei la startpartan subdiskon en DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1145,7 +1094,7 @@ msgstr ""
 "Vi devas krei praŝargon PPC PReP Boot! La instalado daŭros, sed por startigi "
 "vian sistemon, vi devas krei la praŝargan subdiskon en DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1160,12 +1109,12 @@ msgstr ""
 "kiam vi finos.\n"
 "Se vi ne havas ĝin, klaku \"Nuligu\" por eviti la instaladon de ĉi tiu KDROM."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Serĉas haveblajn pakaĵojn"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1174,7 +1123,7 @@ msgstr ""
 "Via sistemo ne havas sufiĉe da spaco libera por instalado aŭ ĝisdatigo (%dMB "
 "> %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1183,54 +1132,54 @@ msgstr ""
 "Bonvole elektu ŝargi aŭ konservi pakaĵ-elekton.\n"
 " La formato estas la sama kiel dosieroj generitaj per auto_install."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Ŝargu"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Konservu"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Malbona dosiero"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Elektado de Pakaĵaj Grupoj"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, fuzzy, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 "Vi povas elekti profilon de labortablo de via laborejo: KDE, GNOME aŭ "
 "Personigita"
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Elektita grandeco estas pli ampleksa ol disponebla spaco"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Instaltipo"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1239,84 +1188,84 @@ msgstr ""
 "Vi ne elektis pakaĵgrupon.\n"
 "Bonvole elektu la minimuman instaladon kiun vi deziras:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Kun X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Kun baza dokumentaĵo (rekomendita!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Vere minimuma instalado (precipe ne urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Preparas instaladon"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalanta pakaĵo %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Estis eraro ordigi pakaĵojn:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Ĉu vi deziras daŭri tamen?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Reprovu"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Transsalti tiun pakaĵon"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Transsalti ĉiujn pakaĵojn de la datenportilo \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Reiru al la datenportilo kaj pakaĵ-selekto"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Estis eraro dum instalado de pakaĵo %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Post-instala konfigurado"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Bonvole certiĝu ke la datenportilo por ĝisdatigaj moduloj troviĝas en la "
 "aparato %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Ĝisdatigoj"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1337,28 +1286,28 @@ msgstr ""
 "\n"
 "Ĉu vi deziras instali tiujn ĝisdatigojn?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s sur %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Aparataro"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Sonkarto"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Ĉu vi havas ISA-sonkarton?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1367,67 +1316,67 @@ msgstr ""
 "Rulu \"alsaconf\" aŭ \"sndconfig\" post instalado por konfiguri vian "
 "sonkarton"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Ne detektis sonkarto. Provu \"harddrake\" post instalado"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafika interfaco"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Reto kaj Interreto"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Prokuraj Serviloj"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "konfigurita"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "sekurnivelo"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Fajromuro (Firewall)"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktiva"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "malebligita"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Vi ne konfiguris X-on. Ĉu vi certas vere voli tion?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Preparas startŝargilon"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1440,7 +1389,7 @@ msgstr ""
 "rimedon por startigi vian maŝinon. La kerno-argumento por la root fs "
 "[dosiersistemo] estas: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1449,17 +1398,17 @@ msgstr ""
 "Sur tiu ĉi sekurec-nivelo, la aliro al dosieroj en la Vindozaj subdiskoj "
 "estas limigitaj al la mastrumanto."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Enŝovu malplenan disketon en drajvo %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Kreas aŭtoinstalan disketon"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1470,7 +1419,7 @@ msgstr ""
 "\n"
 "Ĉu vi vere volas ĉesi nun?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulojn"
@@ -1614,6 +1563,15 @@ msgid ""
 "Exit"
 msgstr "Eliro"
 
+#~ msgid "Downloading file %s..."
+#~ msgstr "Mi deŝutas dosieron %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Ĝisdatigo de 32-bita al 64-bita eldono ne estas subtenata"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Ĝisdatigo de 64-bita al 32-bita eldono ne estas subtenata"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/es.po b/perl-install/install/share/po/es.po
index 81a853fa7..ed120c602 100644
--- a/perl-install/install/share/po/es.po
+++ b/perl-install/install/share/po/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2008-10-02 09:35-0300\n"
 "Last-Translator: Fabián Mandelbaum <fmandelbaum@gmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -21,31 +21,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Su escritorio en un pendrive USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "La distribución Mandriva Linux 100% Open Source"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Explore Linux con facilidad por medio de Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Un escritorio Mandriva Linux completo, con soporte"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distribuciones para las necesidades de todos"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -86,17 +61,17 @@ msgstr "Red (FTP)"
 msgid "Network (NFS)"
 msgstr "Red (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "¿URL del sitio réplica?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "El URL debe empezar con ftp:// o http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -104,7 +79,7 @@ msgstr ""
 "Contactando con el sitio web de Mandriva Linux para obtener la lista de las "
 "réplicas disponibles"
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -113,47 +88,47 @@ msgstr ""
 "No se pudo conectar con el sitio web de Mandriva Linux para obtener la lista "
 "de las réplicas disponibles"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Elija un sitio de réplica del cual obtener los paquetes"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "Configuración NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Ingrese el nombre de servidor y el directorio de su soporte NFS"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Falta el nombre del servidor"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "El directorio debe empezar con \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "¿Nombre del servidor del montaje NFS?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Directorio"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Suplementario"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -162,22 +137,22 @@ msgstr ""
 "No puedo encontrar el archivo hdlist en este sitio réplica. Asegúrese que la "
 "ubicación es correcta."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Buscando paquetes ya instalados..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Encontrando los paquetes a actualizar..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Quitando paquetes antes de actualizar..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -195,18 +170,18 @@ msgstr ""
 "Para actualizar con KDE 3.5 y preservar su configuración, por favor\n"
 "vuelva a iniciar su sistema y actualize utilizando el applet Mandriva Update."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -219,72 +194,72 @@ msgstr ""
 "\n"
 "¿Realmente desea quitar estos paquetes?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Error al leer el archivo %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Se renombraron los discos siguientes:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (antes conocido como %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Red"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Por favor, elija un soporte"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "El archivo ya existe. ¿Desea sobreescribirlo?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nombre NFS incorrecto"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Soporte %s incorrecto"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "No se pueden realizar instantáneas de pantalla antes del particionado"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
@@ -297,11 +272,15 @@ msgid "Installation"
 msgstr "Instalación"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Configuración"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -327,22 +306,22 @@ msgstr "Levantando la red"
 msgid "Bringing down the network"
 msgstr "Bajando la red"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Por favor espere, recuperando archivo"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Descargando el archivo %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Copiando algunos paquetes en el disco para uso futuro"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Copia en curso"
@@ -386,27 +365,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Ocurrió un error"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "Fallaron %d transacciones de instalación"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Instalando el paquete %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Estación de trabajo de Oficina"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -415,7 +394,7 @@ msgstr ""
 "Programas de Oficina: procesadores de texto (OpenOffice.org Writer, Kword), "
 "hojas de cálculo (OpenOffice.org Calc, Kspread), visualizadores PDF, etc"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -424,32 +403,32 @@ msgstr ""
 "Programas de Oficina: procesadores de palabras (kword, abiword), plantillas "
 "de cálculo (kspread, gnumeric), visualizadores PDF, etc"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Estación de Juegos"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programas de entretenimiento: arcade, tableros, estrategia, etc"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Estación Multimedios"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programas de reproducción/edición de sonido y vídeo"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Estación Internet"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -458,211 +437,193 @@ msgstr ""
 "Conjunto de herramientas para leer y enviar correo y noticias (mutt, tin...) "
 "y para navegar por la Web"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Computadora de Red (cliente)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clientes para los distintos protocolos incluyendo a SSH"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Herramientas para facilitar la configuración de su computadora"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Herramientas para la consola"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editores, shells, manipulación de archivos, terminales"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Desarrollo"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Bibliotecas de desarrollo C y C++, programas y archivos *.h"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Documentación"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Libros y COMOs sobre Linux y Software Libre"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Soporte de aplicaciones de terceros"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Servidor web"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Grupos de trabajo"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Servidor Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Cortafuegos/Router"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Pasarela de acceso a Internet"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Correo/Noticias"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Servidor de correo Postfix, servidor de noticias Inn"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Servidor de directorios"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Servidor FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Servidor de nombres de dominio y servidor de información de red"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Servidor de archivos e impresión"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Servidor NFS, servidor Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Base de Datos"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Servidor de base de datos PostgreSQL y MySQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache y Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Correo"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Servidor de correo Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "Servidor de base de datos PostgreSQL o MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Servidor de red"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Servidor NFS, servidor SMB, servidor proxy, servidor SSH"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Entorno gráfico"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "Estación de trabajo KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -671,12 +632,12 @@ msgstr ""
 "El K Desktop Environment, el entorno gráfico básico con una colección de "
 "herramientas que lo acompañan"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Estación de trabajo GNOME"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -685,7 +646,7 @@ msgstr ""
 "Entorno gráfico con un conjunto de herramientas de escritorio y aplicaciones "
 "amigables"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Escritorio KDE"
@@ -699,54 +660,52 @@ msgstr ""
 "Entorno gráfico con un conjunto de herramientas de escritorio y aplicaciones "
 "amigables"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Otros entornos gráficos"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Utilidades"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "Servidor SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Servidor de configuración remota Webmin"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Utilidades/Supervisión de red"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Herramientas de supervisión, control de procesos, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Asistentes de Mandriva"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Asistentes para configurar el servidor"
@@ -845,17 +804,17 @@ msgstr "Aquí tiene un previsualización del escritorio '%s'."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Haga clic sobre las imágenes para agrandarlas"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Selección de grupos de paquetes"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Selección de paquetes individuales"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Tamaño total: %d / %d MB"
@@ -974,12 +933,12 @@ msgstr "Instalación mínima"
 msgid "Software Management"
 msgstr "Administración de software"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Elija los paquetes que desea instalar"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalando"
@@ -1006,7 +965,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d paquete"
 msgstr[1] "%d paquetes"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Resumen"
@@ -1016,7 +975,7 @@ msgstr "Resumen"
 msgid "Configure"
 msgstr "Configurar"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "no configurado"
@@ -1026,7 +985,7 @@ msgstr "no configurado"
 msgid "Media Selection"
 msgstr "Selección de soportes"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1035,7 +994,7 @@ msgstr ""
 "Se han encontrado los siguientes soportes de instalación.\n"
 "Si quiere saltarse alguno de ellos, puede deseleccionarlos ahora."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1048,7 +1007,7 @@ msgstr ""
 "La misma continuará desde el disco duro y los paquetes estarán disponibles "
 "una vez que el sistema esté completamente instalado."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copiar los CD por completo"
@@ -1068,59 +1027,49 @@ msgstr "Por favor, elija el tipo de su teclado"
 msgid "Here is the full list of available keyboards:"
 msgstr "Aquí tiene la lista completa de teclados disponibles:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalación/Actualización"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "¿Es una instalación o una actualización?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalación"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Actualizar %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "No se soporta la acutalización de una distribución 32 bit a una 64 bit"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "No se soporta la actualización de una distribución 64 bit a una 32 bit"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Clave de cifrado para %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Cancelar la instalación, volver a iniciar el sistema"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Instalación nueva"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Actualizar la instalación previa (no se recomienda)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1139,17 +1088,17 @@ msgstr ""
 "¡Atención: debería hacer copia de respaldo de todos sus datos\n"
 "antes de comenzar con la instalación nueva!"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Configurando dispositivos IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1158,7 +1107,7 @@ msgstr ""
 "¡No hay 1MB de espacio para bootstrap! La instalación continuará, pero para "
 "arrancar su sistema, necesitará crear la partición bootstrap en DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1169,7 +1118,7 @@ msgstr ""
 "pero, para arrancar su sistema, necesitará crear la partición bootstrap en "
 "DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1183,12 +1132,12 @@ msgstr ""
 "cuando lo haya hecho.\n"
 "Si no lo posee, pulse Cancelar para evitar la instalación desde este CD-ROM."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Buscando los paquetes disponibles..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1197,7 +1146,7 @@ msgstr ""
 "Su sistema no tiene espacio libre suficiente para la instalación o "
 "actualización (%d MB > %d MB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1207,52 +1156,52 @@ msgstr ""
 "El formato es el mismo que el de los archivos generados con la instación "
 "automática."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Cargar"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Guardar"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Archivo incorrecto"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Selección del entorno de escritorio"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Puede elegir un perfil de escritorio de estación de trabajo."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "El tamaño seleccionado es mayor que el disponible"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipo de instalación."
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1261,84 +1210,84 @@ msgstr ""
 "No ha seleccionado ningún grupo de paquetes\n"
 "Elija por favor la instalación mínima que desea."
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Con X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Con documentación básica (¡recomendado!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instalación mínima \"en serio\" (especialmente sin urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Preparando la instalación"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalando el paquete %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Hubo un error al ordenar los paquetes:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "¿Seguir adelante?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Reintentarlo"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Omitir este paquete"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Omitir todos los paquetes del soporte \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Volver a la selección de paquetes"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Hubo un error al instalar el paquete %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuración posterior a la instalación"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Por favor, asegúrese de que el soporte de actualización de módulos está en "
 "la unidad %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Actualizaciones"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1359,28 +1308,28 @@ msgstr ""
 "\n"
 "¿Desea instalar las actualizaciones?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s en %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Tarjeta de sonido"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "¿Tiene una tarjeta de sonido ISA?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1389,68 +1338,68 @@ msgstr ""
 "Use \"alsaconf\" o \"sndconfig\" luego de la instalación para configurar su "
 "tarjeta de sonido"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "No se detectó tarjeta de sonido. Pruebe \"harddrake\" luego de la instalación"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfaz gráfica"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Redes e Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxis"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "configurado"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Nivel de seguridad"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Cortafuegos"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "activado"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "No ha configurado a X ¿Está seguro que realmente desea esto?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Preparando el cargador de arranque"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1464,7 +1413,7 @@ msgstr ""
 "utilizar BootX o alguna otra manera para arrancar su máquina. El parámetro "
 "del kernel para el sistema de archvivos raíz es: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1473,17 +1422,17 @@ msgstr ""
 "En este nivel de seguridad, el acceso a los archivos en la partición Windows "
 "está restringido sólo al administrador."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Inserte un disquete en blanco en la unidad %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Creando el disquete de instalación automática"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1494,7 +1443,7 @@ msgstr ""
 "\n"
 "¿Realmente desea salir ahora?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Felicidades"
@@ -1638,6 +1587,32 @@ msgid ""
 "Exit"
 msgstr "Salir"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Su escritorio en un pendrive USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "La distribución Mandriva Linux 100% Open Source"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Explore Linux con facilidad por medio de Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Un escritorio Mandriva Linux completo, con soporte"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distribuciones para las necesidades de todos"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Descargando el archivo %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "No se soporta la acutalización de una distribución 32 bit a una 64 bit"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "No se soporta la actualización de una distribución 64 bit a una 32 bit"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/et.po b/perl-install/install/share/po/et.po
index cb7ceba72..cad3e4476 100644
--- a/perl-install/install/share/po/et.po
+++ b/perl-install/install/share/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-et\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-02-16 12:27+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -17,31 +17,6 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Kogu töölaud USB-pulgal"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% vaba tarkvaraga Mandriva Linuxi distributsioon"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Linuxi hõlpus tundmaõppimine Mandriva One abil"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Täielik Mandriva Linuxi töölaud koos kasutajatoega"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distributsioone igale maitsele ja kõigiks vajadusteks"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -81,24 +56,24 @@ msgstr "Võrk (FTP)"
 msgid "Network (NFS)"
 msgstr "Võrk (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Peegli URL?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL-i alguses peab seisma ftp:// või http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "Mandriva Linuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -107,47 +82,47 @@ msgstr ""
 "Ühenduse loomine Mandriva Linuxi veebisaidiga saadaolevate peeglite "
 "nimekirja hankimiseks nurjus"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Valige peegel, millelt lugeda pakettide nimekiri"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-i seadistamine"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Palun andke NFS-andmekandja masinanimi ja kataloog"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Masinanimi puudub"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Kataloogi alguses peab olema \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS-i andmekandja masinanimi?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Kataloog"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Täiendav"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -156,22 +131,22 @@ msgstr ""
 "Tarkvara nimekirja sisaldava faili leidmine sellelt peeglilt nurjus. "
 "Kontrollige palun asukohta."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Juba paigaldatud pakettide tuvastamine..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Uuendatavate pakettide otsimine..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Pakettide eemaldamine enne uuendamist..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -190,18 +165,18 @@ msgstr ""
 "käivitage oma süsteem uuesti ja sooritage uuendamine Mandriva uuendusapleti "
 "abil."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Taaskäivitus"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Jätka"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -214,72 +189,72 @@ msgstr ""
 "\n"
 "Kas tõesti eemaldada need paketid?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Viga faili %s lugemisel"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Järgmistele ketastele anti uus nimi:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (varem oli %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Võrk"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Palun valige andmekandja"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fail on juba olemas. Kas kirjutada see üle?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Ligipääs keelatud"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Vigane NFS-i nimi"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Vigane andmekandja %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Ekraanipilte ei saa teha enne partitsioneerimist"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ekraanipildid asuvad pärast paigaldamist asukohas %s"
@@ -290,11 +265,15 @@ msgid "Installation"
 msgstr "Paigaldamine"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Seadistamine"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -319,22 +298,22 @@ msgstr "Võrgu aktiveerimine"
 msgid "Bringing down the network"
 msgstr "Võrgu seiskamine"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Palun oodake, tõmmatakse faili"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Faili %s allalaadimine..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Mõningate tarkvarapakettide kopeerimine kettale edasiseks kasutamiseks"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Käib kopeerimine..."
@@ -378,27 +357,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Tekkis viga:"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d paigaldamistehingut nurjus"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Pakettide paigaldamine nurjus:"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Tööjaam"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Kontori-tööjaam"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -407,7 +386,7 @@ msgstr ""
 "Kontoritöö programmid: tekstitöötlus (OpenOffice.org Writer, KWord), "
 "tabelitöötlus (OpenOffice.org Calc, KSpread), PDF-failide näitajad jne"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -416,32 +395,32 @@ msgstr ""
 "Kontoritöö programmid: tekstitöötlus (KWord, Abiword), tabelitöötlus "
 "(KSpread, Gnumeric), PDF-failide näitajad jne"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Mänguvahend"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Meelelahutus: põnevus-, laua-, strateegiamängud jne"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimeedia-tööjaam"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Heli ja video mängimine ja redigeerimine"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Interneti-tööjaam"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -450,230 +429,212 @@ msgstr ""
 "Valik rakendusi e-posti ja uudiste lugemiseks (mutt, tin...) ning veebi "
 "lehitsemiseks"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Võrguarvuti (klient)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Mitme protokolli, sealhulgas ssh kliendid"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Tööriistad süsteemi lihtsamaks haldamiseks"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsoolitööriistad"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktorid, shellid, terminalid, failihaldus"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Arendus"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C ja C++ arendusteegid, rakendused ja päisefailid"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Raamatud ja HOWTO-d Linuxi ja vabavara kohta"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Kolmandate tootjate rakenduste toetus"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Veebiserver"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Grupitöö"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolabi server"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Tulemüür/marsruuter"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "E-post/Uudistegrupid"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfixi e-posti server, Inn uudisteserver"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Kataloogiserver"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-server"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Nimeserver ja võrguteabeserver"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Faili- ja printserver"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS-server, Samba-server"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Andmebaasid"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL- ja MySQL-andmebaasiserver"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Veeb/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache ja Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "E-post"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfixi e-posti server"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL- või MySQL-andmebaasiserver"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Võrguserver"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-, SMB-, SSH-server, puhverserver (proxy)"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Graafiline keskkond"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE tööjaam"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "K töölaua keskkond: graafiline töökeskkond ja palju rakendusi"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME tööjaam"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE töölaud"
@@ -687,54 +648,52 @@ msgstr ""
 "Vähese koormusega ja kiire graafiline töökeskkond koos kasutajasõbralike "
 "rakenduste ja tööriistadega"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Muud graafilised töölauad"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "WindowMaker, Enlightenment, Fvwm jt"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Utiliidid"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-server"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin võrguseadistusserver"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Võrguutiliidid ja võrgu jälgimine"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Jälgimistööriistad, protsesside jälgimine, tcpdump, nmap..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva nõustajad"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Serverite seadistamise nõustajad"
@@ -832,17 +791,17 @@ msgstr "Siin näeb '%s' töölaua eelvaatlust."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klõpsake piltidel suurema eelvaatluse nägemiseks"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Paketigruppide valik"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Valik paketthaaval"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Suurus kokku: %d / %d MB"
@@ -959,12 +918,12 @@ msgstr "Minimaalne paigaldus"
 msgid "Software Management"
 msgstr "Tarkvarahaldur"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Valige paketid, mida soovite paigaldada"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Paigaldamine"
@@ -991,7 +950,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pakett"
 msgstr[1] "%d paketti"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Kokkuvõte"
@@ -1001,7 +960,7 @@ msgstr "Kokkuvõte"
 msgid "Configure"
 msgstr "Seadista"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "seadistamata"
@@ -1011,7 +970,7 @@ msgstr "seadistamata"
 msgid "Media Selection"
 msgstr "Andmekandjate valik"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1020,7 +979,7 @@ msgstr ""
 "Leiti järgmised paigaldusandmekandjad.\n"
 "Kui Te ei soovi mõnda neist kasutada, eemaldage need valikust."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1032,7 +991,7 @@ msgstr ""
 "Seejärel jätkatakse paigaldamist kõvakettalt ning kogu tarkvara on seal "
 "kättesaadav ka pärast süsteemi paigaldamist."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopeeri kõik CD-d"
@@ -1052,59 +1011,49 @@ msgstr "Palun valige klaviatuuriasetus"
 msgid "Here is the full list of available keyboards:"
 msgstr "See on saadaolevate klaviatuuriasetuste täielik nimekiri:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Paigaldamine/Uuendamine"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Kas see on paigaldamine või uuendamine?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Paigaldamine"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s uuendamine"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Uuendamine 32-bitiselt distributsioonilt 64-bitisele ei ole toetatud"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Uuendamine 64-bitiselt distributsioonilt 32-bitisele ei ole toetatud"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s krüptovõti"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Paigaldamisest loobumine, süsteemi taaskäivitamine"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Uus paigaldus"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Varasema paigalduse uuendamine (ei ole soovitatav)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1123,17 +1072,17 @@ msgstr ""
 "Hoiatus: Te peaksite varundama kõik oma isiklikud andmed,\n"
 "enne kui valite võimaluse \"Uus paigaldus\"."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE seadistamine"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1142,7 +1091,7 @@ msgstr ""
 "Ruumi 1MB-se alglaadimisala loomiseks napib! Paigaldamine jätkub, kuid "
 "süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1152,7 +1101,7 @@ msgstr ""
 "Teil tuleb luua PPC PReP Boot alglaadimisala! Paigaldamine jätkub, kuid "
 "süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1165,12 +1114,12 @@ msgstr ""
 "Palun sisestage CD nimega \"%s\" CD-seadmesse ja klõpsake nupule \"Olgu\".\n"
 "Kui Teil sellist ei ole, klõpsake nupule \"Loobu\"."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Saadaolevate pakettide otsimine..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1178,7 +1127,7 @@ msgid ""
 msgstr ""
 "Teie süsteemis ei jagu ruumi paigaldamiseks ega uuendamiseks (%dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1187,52 +1136,52 @@ msgstr ""
 "Valige palun paketivaliku laadimine või salvestamine.\n"
 "Vorming on sama, mis automaatpaigaldusega loodud failide puhul."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Laadi"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Salvesta"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Vigane fail"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Töölaua valik"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Siin saab valida oma arvuti töölauaprofiili: "
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valiku suurus ületab saadaolevat kettaruumi"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Paigaldamise tüüp"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1241,82 +1190,82 @@ msgstr ""
 "Te ei valinud ühtegi paketigruppi.\n"
 "Palun valige meelepärane minimaalne paigaldus:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X'iga"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Baasdokumentatsiooniga (soovitatav!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Tõeliselt minimaalne (eriti just ilma urpmi-ta)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Paigaldamiseks valmistumine"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Paketi %s paigaldamine"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Pakettide tellimisel tekkis viga:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Kas ikkagi jätkata?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Proovi uuesti"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Jäta pakett vahele"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Jäta kõik andmekandja \"%s\" paketid vahele"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Tagasi andmekandja ja paketivaliku juurde"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Paketi %s paigaldamisel tekkis viga."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Paigaldamisjärgne seadistamine"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Palun kontrollige, et uuenduste andmekandja on seadmes %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Uuendused"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1336,28 +1285,28 @@ msgstr ""
 "\n"
 "Kas soovite uuendusi paigaldada?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s asukohas %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Riistvara"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Helikaart"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Kas Teil on ISA helikaart?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1366,69 +1315,69 @@ msgstr ""
 "Helikaardi seadistamiseks käivitage pärast paigaldamist \"alsaconf\" või "
 "\"sndconfig\""
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Helikaarti ei leitud. Proovige see leida pärast paigaldamist \"harddrake\" "
 "abil"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Graafiline kasutajaliides"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Kohtvõrk ja internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Puhverserverid"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "seadistatud"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Turvatase"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Tulemüür"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktiveeritud"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "keelatud"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Te ei ole seadistanud X'i. Kas Te tõesti ei taha seda teha?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Alglaaduri ettevalmistamine..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Varuge kannatust, see võib võtta veidi aega..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1441,7 +1390,7 @@ msgstr ""
 "tuleb Teil kasutada BootX'i või mingit muud nippi. Kerneli argument "
 "juurfailisüsteemi jaoks on root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1450,17 +1399,17 @@ msgstr ""
 "Sellel turvatasemel pääseb Windowsi partitsioonil asuvatele failidele ligi "
 "ainult administraator."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Pange palun tühi diskett seadmesse %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Kiirpaigaldusdisketi loomine..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1471,7 +1420,7 @@ msgstr ""
 "\n"
 "Kas soovite tõesti praegu lõpetada ja väljuda?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Õnnitleme!"
@@ -1615,6 +1564,32 @@ msgid ""
 "Exit"
 msgstr "Välju"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Kogu töölaud USB-pulgal"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% vaba tarkvaraga Mandriva Linuxi distributsioon"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Linuxi hõlpus tundmaõppimine Mandriva One abil"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Täielik Mandriva Linuxi töölaud koos kasutajatoega"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distributsioone igale maitsele ja kõigiks vajadusteks"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Faili %s allalaadimine..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Uuendamine 32-bitiselt distributsioonilt 64-bitisele ei ole toetatud"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Uuendamine 64-bitiselt distributsioonilt 32-bitisele ei ole toetatud"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/eu.po b/perl-install/install/share/po/eu.po
index c1a9f7c57..6d3504c7f 100644
--- a/perl-install/install/share/po/eu.po
+++ b/perl-install/install/share/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-03-01 20:15+0100\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Basque <kde-i18n-doc@lists.kde.org>\n"
@@ -18,31 +18,6 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Zure idaztegia USB giltza batean"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% iturburu irekia duen Mandriva Linux banaketa"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Esploratu Linux era errazean Mandriva One-kin"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Mandriva Linux idaztegi oso bat, eukarriarekin"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: guztientzako beharrak asetzeko banaketak"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -82,24 +57,25 @@ msgstr "Sarea (FTP)"
 msgid "Network (NFS)"
 msgstr "Sarea (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Ispiluaren URL?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL-ak ftp:// edo http:// aurretik izan behar du"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "Mandriva Linux web gunearekin konektatzen, ispilu erabilgarrien zerrenda "
 "lortzeko..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -108,69 +84,69 @@ msgstr ""
 "Mandriva Linux web gunearekin eskuragarri dauden ispiluen zerrenda lortzeko "
 "harremanak huts egin du"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Aukeratu ispilu bat paketeak bertatik hartzeko"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS ezarpena"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Mesedez sartu zure NFS euskarriaren ostalari izena eta direktorioa"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Ostalari izena falta da"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Direktorioa honekin \"/\" hasi behar da"
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS muntaiaren ostalari izena?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Direktorioa"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Osagarria"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Ezin aurkitu hdlist fitxategia ispilu honetan"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Instalatutako paketeak bilatzen..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Bertsio berritzeko paketeak bilatzen..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Paketeak ezabatzen bertsioa berritu aurretik..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -191,18 +167,18 @@ msgstr ""
 "berrabiatu zure sistema eta bertsio berritu Mandrivaren eguneraketa appleta "
 "erabiliz."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Berrabiarazi"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Jarratiu"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -215,75 +191,76 @@ msgstr ""
 "\n"
 "Ziur zaude pakete hauek kendu nahi dituzula?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Errorea %s fitxategia irakurtzean"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Ondoko diskoa(k) berrizendatu egin d(ir)a:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (lehenago %s deitua)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Sarea"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Aukeratu euskarri bat mesedez"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fitxategia badago lehendik ere. Gainidatzi?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "NFS izen okerra"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "%s okerreko euskarria"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Ezin da pantaila-argazkirik egin partizioak egin aurretik"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "%s(e)n instalazioa egindakoan pantaila-argazkiak erabilgarri egongo dira"
+msgstr ""
+"%s(e)n instalazioa egindakoan pantaila-argazkiak erabilgarri egongo dira"
 
 #: gtk.pm:130
 #, c-format
@@ -291,11 +268,15 @@ msgid "Installation"
 msgstr "Instalaketa"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -320,22 +301,22 @@ msgstr "Sarea irekitzen"
 msgid "Bringing down the network"
 msgstr "Sarea ixten"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Itxoin mesedez, fitxategia eskuratzen"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "%s fitxategiak jaisten..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Zenbait pakete diskoetan kopiatzen etorkizunean erabiltzeko"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiatzen ari da"
@@ -379,27 +360,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Errore bat izan da"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instaketa eragiketek huts egin dute"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "%s paketea instalatzen"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Lanpostua"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Bulegoko lanpostua"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -408,7 +389,7 @@ msgstr ""
 "Bulego programak: testu-prozetzaileak (OpenOffice.org Writer, Kword), "
 "kalkulu-orriak (OpenOffice.org Calc, Kspread), PDF ikustaileak, etab"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -417,32 +398,33 @@ msgstr ""
 "Bulego-lanetako programak: testu prozesatzaileak (kword, abiword), kalkulu "
 "orriak (kspread, gnumeric), pdf erakusleak, etab."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Jokoak"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Denbora-pasako programak: makina-jokoak, taula-jokoak, estrategiakoak, etab."
+msgstr ""
+"Denbora-pasako programak: makina-jokoak, taula-jokoak, estrategiakoak, etab."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedia"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Soinua eta bideoa jotzeko/editatzeko programak"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internet"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -451,223 +433,206 @@ msgstr ""
 "Posta eta berri-taldeetako mezuak (mutt, tin...) irakurtzeko eta bidaltzeko "
 "eta Interneten nabigatzeko tresna-multzoa"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Sare-ordenagailua (bezeroa)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Hainbat protokolotako bezeroak, ssh-renak barne"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Zure ordenagailuaren konfigurazioa errazteko tresnak"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Kontsola-tresnak"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editoreak, shell-ak, fitxategi-tresnak, terminalak"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Garapena"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C eta C++ garapen-liburutegiak, programak eta fitxategiak"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentazioa"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linux eta Software libreari buruzko liburuak eta azalpenak"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Beste batzuek egindako aplikazioen euskarria"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Web zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Taldelanerako Aplikazioak"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Zerbitzaria"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Suebakia/Bideratzailea"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Interneteko atebidea"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Posta/Berriak"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix posta zerbitzaria, Inn berri zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Direktorio Zerbitzara"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP Zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domeinu Izen eta Sare Informazio Zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fitxategi eta Inprimaketa Elkarbanatzeko Zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS zerbitzaria, Samba zerbitzaria"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Datu-basea"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL eta MySQL Datubase Zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Posta"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix posta-zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL edo MySQL datu-baseen zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Sare-zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS zerbitzaria, SMB zerbitzaria, Proxy zerbitzaria, ssh zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ingurune grafikoa"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE lanpostua"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
-msgstr "K Desktop Environment, hainbat tresna dituen oinarrizko ingurune grafikoa"
+msgstr ""
+"K Desktop Environment, hainbat tresna dituen oinarrizko ingurune grafikoa"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME lanpostua"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -676,7 +641,7 @@ msgstr ""
 "Aplikazio-multzo eta mahaigaineko tresna lagungarri eta atseginak dituen "
 "ingurune grafikoa"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE Idaztegia"
@@ -690,54 +655,52 @@ msgstr ""
 "Aplikazio-multzo eta mahaigaineko tresna lagungarri eta atseginak dituen "
 "ingurune grafikoa"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Beste mahaigain grafiko batzuk"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, etab."
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Utilitateak"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin Urruneko Konfigurazio Zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Sare Utilitateak/Gainbegiraketa"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Gainbegiraketa tresnak, prozesuen kotabilitatea, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva Morroiak"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Zerbitzaria konfiguratzeko morroiak"
@@ -836,17 +799,17 @@ msgstr "Hemen duzu '%s' idaztegiaren aurrebista bat."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klikatu irudietan aurrebista haundiago ikusteko"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakete-taldearen hautapena"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Pakete indibidualen hautapena"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Guztizko tamaina: %d / %d MB"
@@ -963,12 +926,12 @@ msgstr "Gutxieneko instalazioa"
 msgid "Software Management"
 msgstr "Software kudeaketa"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Aukeratu instalatu nahi dituzun paketeak"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalatzen"
@@ -995,7 +958,7 @@ msgid_plural "%d packages"
 msgstr[0] "pakete %d"
 msgstr[1] "%d pakete"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Laburpena"
@@ -1005,7 +968,7 @@ msgstr "Laburpena"
 msgid "Configure"
 msgstr "Konfiguratu"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "konfiguratu gabe"
@@ -1015,7 +978,7 @@ msgstr "konfiguratu gabe"
 msgid "Media Selection"
 msgstr "Euskarri hautaketa"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1024,7 +987,7 @@ msgstr ""
 "Ondorengo instalazio euskarriak aurkitu dira.\n"
 "Horietako batzuk erabiltzerik nahi ez baduzu, haututik kendu ditzakezu orain."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1036,7 +999,7 @@ msgstr ""
 "Disko zurrunetik jarraituko du orduan eta paketeak eskuragarri egongo dira "
 "sistema osorik instalatu ondoren."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiatu CD osoak"
@@ -1056,59 +1019,49 @@ msgstr "Aukeratu zure teklatu-diseinua"
 msgid "Here is the full list of available keyboards:"
 msgstr "Hemen duzu eskuragarri dauden teklatuen zerrenda osoa:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalaketa/Bertsio berritzea"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Instalaketa edo bertsio berritzea da hau?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalaketa"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s bertsio berritu"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "32bit-eko banaketa batetik 64bit-ekora bertsio berritzea ez da onartzen"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "64bit-eko banaketa batetik 32bit-ekora bertsio berritzea ez da onartzen"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s(r)en enkriptatze-gakoa"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Instalaketa galarazi, sistema berrabiatu"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Instalaketa berria"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Aurreko instalaketa bertsio berritu (ez da gomendatzen)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1127,17 +1080,17 @@ msgstr ""
 "Erne: zure datu pertsonalen babeskopia egin behar zenuke \"Instalaketa\n"
 "Berria\" aukeratu aurretik\"."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE konfiguratzen"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1147,7 +1100,7 @@ msgstr ""
 "baina sistema abiarazteko, bootstrap partizioa sortu beharko duzu DiskDrake-"
 "rekin"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1158,7 +1111,7 @@ msgstr ""
 "jarraituko du, baino zure sistema abiarazteko, bootstrap partizioa sortu "
 "beharko duzu DiskDrake erabiliz"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1172,12 +1125,12 @@ msgstr ""
 "'Ados'.\n"
 "Ez badaukazu, sakatu 'Utzi' CD-ROM horretatik instalazioa egin ez dezan."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Pakete erabilgarriak bilatzen..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1186,7 +1139,7 @@ msgstr ""
 "Zure sistemak ez dauka instalatu edo bertsio berritzeko behar duen lekua (%d "
 "MB > %d MB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1195,52 +1148,52 @@ msgstr ""
 "Mesedez aukeratu pakete aukeraketa zamatu edo gorde.\n"
 "Formatua instalazio automatikoarekin sortutako fitxategiaren berdina da."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Karga"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Gorde"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Okerreko fitxategia"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Idaztegi hautaketa"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Zure lanpostuaren idaztegi profila hautatu dezakezu."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Hautatutako tamaina handiagoa da leku erabilgarria baino"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Instalazio-mota"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1249,82 +1202,82 @@ msgstr ""
 "Ez duzu talde edo paketerik hautatuta\n"
 "Nahi duzun gutxieneko instalazioa hautatu behar duzu:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Xrekin"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Oinarrizko dokumentazioarekin (gomendatua)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instalazio minimo-minimoa (batez ere, urpmi gabe)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Instalazioa prestatzen"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "%s paketea instalatzen"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Errore bat izan da paketeak ordenatzean:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Jarraitu hala ere?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Berriro saiatu"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Pakete hau utzi"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "\"%s\" euskarriko pakete guztiak utzi"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Jo atzera euskarri eta pakete hautapenera"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Akatsa gertatu da %s paketea instalatzerakoan."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Instalazio-ondorengo konfigurazioa"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Mesedez egiaztatu Moduluak Eguneratzeko euskarria %s unitatean dagoela"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Eguneraketak"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1345,28 +1298,28 @@ msgstr ""
 "\n"
 "Eguneratzeak instalatu nahi dituzu?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s - %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Hardwarea"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Soinu-txartela"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "ISA soinu-txartela duzu?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1375,69 +1328,69 @@ msgstr ""
 "Instalazioa egindakoan, exekutatu \"alsaconf\" edo \"sndconfig\" soinu-"
 "txartela konfiguratzeko"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Ez da detektatu soinu-txartelik. Probatu \"harddrake\" instalazioa egin "
 "ondoren"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfaze grafikoa"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Sarea eta Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxy-ak"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "konfiguratuta"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Segurtasun-maila"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Suebakia"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktibatuta"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "desgaituta"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "X ez duzu konfiguratu. Ziur zaude hori dela egin nahi duzuna?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Abioko kargatzailea prestatzen..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Pazientzia izan, pixka baterako dauka..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1450,7 +1403,7 @@ msgstr ""
 "abiatzeko beste bide bat erabili beharko duzu zure makina abiarazteko. Erro "
 "fitxategi sistemarentzako nukleo argumentua honakoa da: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1459,17 +1412,17 @@ msgstr ""
 "Segurtasun-maila honetan, administratzaileak soilik du Windows partizioko "
 "fitxategiak atzitzeko eskubidea."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sartu diskete huts bat %s unitatean"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Auto-instalazioko disketea sortzen..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1480,7 +1433,7 @@ msgstr ""
 "\n"
 "Ziur zaude orain irten nahi duzula?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Zorionak"
@@ -1624,6 +1577,32 @@ msgid ""
 "Exit"
 msgstr "Irten"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Zure idaztegia USB giltza batean"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% iturburu irekia duen Mandriva Linux banaketa"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Esploratu Linux era errazean Mandriva One-kin"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Mandriva Linux idaztegi oso bat, eukarriarekin"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: guztientzako beharrak asetzeko banaketak"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "%s fitxategiak jaisten..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "32bit-eko banaketa batetik 64bit-ekora bertsio berritzea ez da onartzen"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "64bit-eko banaketa batetik 32bit-ekora bertsio berritzea ez da onartzen"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
@@ -1650,4 +1629,3 @@ msgstr "Irten"
 
 #~ msgid "IceWm Desktop"
 #~ msgstr "IceWm Idaztegia"
-
diff --git a/perl-install/install/share/po/fa.po b/perl-install/install/share/po/fa.po
index 7f90fb466..d8b057330 100644
--- a/perl-install/install/share/po/fa.po
+++ b/perl-install/install/share/po/fa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2005-02-26 06:31+0100\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -16,31 +16,6 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -76,17 +51,17 @@ msgstr "شبکه (FTP)"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "نشانی اینترنتی آینه؟"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -94,7 +69,7 @@ msgstr ""
 "در حال تماس گرفتن با وب‌گاه لینوکس ماندریبا برای دریافت لیست پایگاه‌های "
 "آینه‌های موجود..."
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -103,69 +78,69 @@ msgstr ""
 "در حال تماس گرفتن با وب‌گاه لینوکس ماندریبا برای دریافت لیست پایگاه‌های "
 "آینه‌های موجود..."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "انتخاب آینه‌ای برای گرفتن بسته‌ها"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "شاخه"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "نمیتوان پرونده hdlist را بر این آینه پیدا کرد"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "بررسی بسته‌های از قبل نصب شده..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "یافتن بسته‌های برای ارتقاء..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -177,18 +152,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "آغازگری مجدد"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -201,72 +176,72 @@ msgstr ""
 "\n"
 "آیا واقعاً می‌خواهید این بسته‌ها را بردارید؟\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "خطا در خواندن پرونده‌ی %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "دیسک(های) بدنبال تغییر نام داده شده‌اند:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (قبلا نامش %s بود("
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "شبکه"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "لطفاً رسانه‌ای را انتخاب کنید"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "پرونده از قبل وجود دارد. بازنویسی شود؟"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "اجازه داده نشد"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "رسانه بد %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "نمی‌توان قبل از قسمت‌بندی عکس‌صفحه گرفت"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "عکس‌صفحه‌ها بعد از نصب در %s در دسترس خواهند بود"
@@ -277,11 +252,15 @@ msgid "Installation"
 msgstr "نصب کردن"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "پیکربندی"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -306,22 +285,22 @@ msgstr "بالا آوردن شبکه"
 msgid "Bringing down the network"
 msgstr "پایین آوردن شبکه"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "فرستادن پرونده‌ها..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "کپی کردن در حال انجام است"
@@ -363,27 +342,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "خطائی رخ داد"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "نصب شکست خورد"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "نصب کردن بسته‌ی %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "ایستگاه‌کار"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "ایستگاه‌کار دفتری"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -392,7 +371,7 @@ msgstr ""
 "برنامه های دفتری: واژه پردازان (OpenOffice.org Writer, Kword), spreadsheets "
 "(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -401,262 +380,244 @@ msgstr ""
 "برنامه‌های دفتری: واژه پردازها ((kword, abiword), برگ‌های حساب (kspread, "
 "gnumeric), نماگرهای pdf و غیره"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "ایستگاه بازی"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "برنامه‌های سرگرمی: آرکید، تخته‌ها، تاکتیکی، غیره"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "ایستگاه چندرسانه‌ای"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "برنامه‌های ویرایش/پخش ویدیو و صوت"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "ایستگاه اینترنت"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "مجموعه ابزار خواندن و ارسال پست و اخبار (mutt, tin..) و برای مرور وب"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "رایانه‌ی شبکه (کارگیر)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "کارگیرها برای پایان‌نامه‌های گوناگون از جمله ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "ابزارهای برای آسان‌ کردن پیکربندی رایانه‌اتان"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "ابزارهای کنسول"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "ویرایش‌گرها، پوسته‌ها، ابزار پرونده، پایانه‌ها"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "برنامه‌سازی"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "کتابخانه‌های برنامه‌سازی C و C++، برنامه‌ها و پرونده‌های شامل"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "نوشتار"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "کتاب‌ها و چگونگی‌ها در لینوکس و نرم‌افزار آزاد"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "پایه‌ی استاندارد لینوکس. حمایت برنامه‌های شخص سوم"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "کارگزار‌ وب"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "آپاچ"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "گروه افزار"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "کارگزار Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "دیوار‌آتش/مسیریاب"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "دروازه‌ی اینترنت"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "پست/اخبار"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "کارگزار پست Postfix، کارگزار اخبار Inn "
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "کارگزار شاخه"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "کارگزار FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "نام دامنه و کارگزار اطلاعات شبکه"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "کارگزاراشتراک چاپگر و پرونده"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "کارگزار NFS، کارگزار Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "بانک ‌اطلاعات"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "کارگزار پایگاه داده‌ی PostgreSQL و MySQL "
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "پست"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "کارگزار پست Postfix "
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "کارگزار بانک اطلاعاتی PostgreSQL یا MySQL "
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "کارگزار شبکه‌ی رایانه"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "کارگزار NFS , کارگزار SMB , کارگزار Proxy , کارگزار ssh "
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "محیط گرافیکی"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "ایستگاه‌کار KDE "
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "محیط رومیزی K، محیط گرافیکی پایه با مجموعه‌ای از ابزارهای ضمیمه"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "ایستگاه‌کار گنوم"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "محیط گرافیکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "رومیزی Plucker"
@@ -668,54 +629,52 @@ msgid ""
 "applications and desktop tools"
 msgstr "محیط گرافیکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "دیگر رومیزی‌های گرافیکی"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, fuzzy, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "وسایل"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "کارگزار‌ SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "کارگزار پیکربندی از راه دور Webmin "
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "پایشگری/وسایل شبکه"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "ابزار پایشگری، پروسه های حسابداری، tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "جادوگران نرم افزار ماندریبا"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "جادوگران برای پیکربندی کارگزار"
@@ -816,17 +775,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "گزینش گروه بسته"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "انتخاب بسته‌ی تکی"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "اندازه‌ی کل: %d / %d مگابایت"
@@ -945,12 +904,12 @@ msgstr "نصب حداقل"
 msgid "Software Management"
 msgstr "مدیریت نرم‌افزار"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "بسته‌هایی را که می‌خواهید نصب کنید انتخاب کنید"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "نصب کردن"
@@ -976,7 +935,7 @@ msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "بسته‌های %d"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "خلاصه"
@@ -986,7 +945,7 @@ msgstr "خلاصه"
 msgid "Configure"
 msgstr "پیکربندی"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "پیکربندی نشده است"
@@ -996,7 +955,7 @@ msgstr "پیکربندی نشده است"
 msgid "Media Selection"
 msgstr "گزینش گروه بسته"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1005,7 +964,7 @@ msgstr ""
 "رسانه نصب بدنبال آمده یافت شد.\n"
 "اگر میخواهید بعضی از آنها را نادیده بگیرید میتوانید آنها را اکنون نگزینید."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1017,7 +976,7 @@ msgstr ""
 "سپس آن از دیسک سخت ادامه یافته و بسته‌ها وقتی که سیستم کاملا نصب گردید در "
 "دسترس خواهند بود."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "کپی کردن تمام سی‌دی‌ها"
@@ -1037,59 +996,49 @@ msgstr "لطفاً طرح صفحه‌کلید خود را انتخاب کنید"
 msgid "Here is the full list of available keyboards:"
 msgstr "این لیست کامل صفحه‌کلیدهای در دسترس می‌باشد"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "نصب/ارتقاء"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "آیا این یک نصب است یا یک ارتقاء؟"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "نصب"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "ارتقاء دادن %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "کلید رمزی برای %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "نصب کردن"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1101,17 +1050,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "پیکربندی IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1120,7 +1069,7 @@ msgstr ""
 "هیچ فضای آزادی برای ۱ مگابایت تسمه‌ی آغازگری ! نصب ادامه پیدا خواهد کرد، ولی "
 "باید قسمت‌بندی تسمه آغازگری را در DiskDrake ایجاد کنید"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1130,7 +1079,7 @@ msgstr ""
 "شما نیاز به ایجاد یک تسمه‌ی آغازگری PPC PReP دارید! نصب ادامه پیدا خواهد کرد، "
 "ولی باید قسمت‌بندی تسمه آغازگری را در DiskDrake ایجاد کنید"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1143,19 +1092,19 @@ msgstr ""
 "فشار دهید. \n"
 "اگر آن را ندارید، لغو را برای جلوگیری از نصب این سی‌دی-رم فشار دهید."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "جستجو برای بسته‌های موجود..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1164,52 +1113,52 @@ msgstr ""
 "لطفاً بارگذاری یا ذخیره‌ی مجموعه بسته را انتخاب کنید.\n"
 "قالب همانند پرونده‌های تولید شده‌ی نصب-خودکار است."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "بارگذاری"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "ذخیره"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "پرونده بد"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "گنوم"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "گزینش گروه بسته"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "اندازه‌های انتخاب شده بزرگ‌تر از فضای موجود است"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "نوع نصب"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1218,82 +1167,82 @@ msgstr ""
 "هیچ گروه از بسته‌ها را انتخاب نکرده‌اید.\n"
 "لطفاً حداقل نصبی را که می‌خواهید انتخاب کنید:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "با X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "با نوشتارهای پایه (سفارش می‌شود!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "حقیقتاً حداقل نصب (مخصوصاً بدون urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "آماده کردن نصب"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "نصب کردن بسته‌ی %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "خطائی در مرتب کردن بسته‌ها رخ داد:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "ادامه به هر حال؟"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "ذخیره‌ی مجموعه بسته‌ها"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "خطائی هنگام نصب بسته‌ها وجود داشت:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "پیکربندی بعد از نصب"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "بروزسازی‌ها"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1313,28 +1262,28 @@ msgstr ""
 "\n"
 "آیا می‌خواهید بروزسازی‌ها را نصب کنید؟"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s بر %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "سخت‌افزار"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "کارت صوتی"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "آیا کارت صوتی ISA دارید؟"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1343,67 +1292,67 @@ msgstr ""
 "برای پیکربندی کارت صوتی خود بعد از نصب برنامه‌ی \"sndconfig\" یا \"alsaconf"
 "\"  را اجرا کنید"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "هیچ کارت صوتی شناسایی نشد. \"harddrake\" را بعد از نصب امتحان کنید"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "واسط گرافیکی"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "شبکه و اینترنت"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "پراکسی‌ها"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "پیکربندی شده"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "سطح امنیتی"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "دیوارآتش"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "فعال شده"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "از کار افتاده"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "شما ایکس را پیکربندی نکرده‌اید. آیا واقعاً مطمئنید که این را می‌خواهید؟"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "آماده کردن بارگذار آغازگر..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1417,7 +1366,7 @@ msgstr ""
 "از BootX یا طریق دیگری برای آغازگری استفاده کنید.  آرگومان هسته برای سیستم "
 "پرونده ریشه: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1425,17 +1374,17 @@ msgid ""
 msgstr ""
 "در این سطح امنیتی، دستیابی به پرونده‌های قسمت‌بندی ویندوز محدود به مدیر است."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "یک دیسکچه‌ی خالی را در گرداننده‌ی %s داخل کنید"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "ایجاد کردن دیسکچه‌ی نصب خودکار..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1446,7 +1395,7 @@ msgstr ""
 "\n"
 "واقعاً می‌خواهید اکنون ترک کنید؟"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "تبریک می‌گوئیم!"
@@ -1590,6 +1539,10 @@ msgid ""
 "Exit"
 msgstr "خروج"
 
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "فرستادن پرونده‌ها..."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/fi.po b/perl-install/install/share/po/fi.po
index 70125b53c..f4bfc278a 100644
--- a/perl-install/install/share/po/fi.po
+++ b/perl-install/install/share/po/fi.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2008-10-02 21:39+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -24,31 +24,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Työpöytäsi USB-tikulla"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% vapaan lähdekoodin Mandriva Linux -jakelu"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Tutustu Linuxiin helposti Mandriva Onella"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Täysi Mandriva Linux -jakelu käyttäjätuella"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: jakeluja jokaisen tarpeisiin"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -88,24 +63,24 @@ msgstr "Verkko (FTP)"
 msgid "Network (NFS)"
 msgstr "Verkko (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Peilipalvelimen URL?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL pitää alkaa ftp:// tai http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "Otetaan yhteys Mandriva Linuxin sivustolle peilipalvelinlistan saamiseksi..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -114,69 +89,69 @@ msgstr ""
 "Yhteydenotto Mandriva Linuxin sivustolle peilipalvelinlistan saamiseksi "
 "epäonnistui"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Valitse peilipalvelin josta paketit haetaan"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS Asetus"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Syötä NFS-palvelimesi nimi ja hakemistopolku"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Palvelimen osoite puuttuu"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Hakemistopolun täytyy alkaa \"/\"-merkillä"
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS-liitoksen palvelimen nimi?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Kansio"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Lisämedia"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "En löydä hdlist tiedostoa tässä peilipalvelimessa."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Etsitään jo asennettuja paketteja..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Etsitään päivitettäviä paketteja..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Poistetaan paketteja ennen päivitystä..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -195,18 +170,18 @@ msgstr ""
 "asetuksesi, ole hyvä ja käynnistä tietokoneesi uudelleen ja päivitä\n"
 "järjestelmäsi käyttäen MandrivaUpdate."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Käynnistä uudelleen"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -219,72 +194,72 @@ msgstr ""
 "\n"
 "Haluatko varmasti poistaa nämä paketit?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Virhe lukiessa tiedostoa %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Seuraava(t) levy(t) uudelleennimettiin:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (oli ennen nimetty %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Verkko"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Ole hyvä ja valitse media"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Tiedosto jo olemassa. Korvaa?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Ei oikeuksia"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Virheellinen NFS-nimi"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Huono media %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Kuvakaappauksia ei voida tehdä ennen osiointia"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Kuvakaappaukset löytyvät asennuksen jälkeen hakemistosta %s"
@@ -295,11 +270,15 @@ msgid "Installation"
 msgstr "Asennus"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Asetustyökalut"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -324,22 +303,22 @@ msgstr "Käynnistetään verkkoa"
 msgid "Bringing down the network"
 msgstr "Ajetaan alas verkkoa"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Odota hetki, tiedostoa haetaan"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Haetaan tiedosto %s ..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopioin paketteja kovalevylle myöhempään käyttöön"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiointi käynnissä"
@@ -383,27 +362,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Ilmeni virhe"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d asennustapahtumaa epäonnistui"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Asennetaan pakettia: %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Työasema"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Toimistotyöasema"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -412,7 +391,7 @@ msgstr ""
 "Toimisto-ohjelmistot: tekstinkäsittely (OpenOffice.org Writer, Kword), "
 "taulukkolaskenta (OpenOffice.org calc, Kspread), PDF-lukijat jne"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -421,32 +400,32 @@ msgstr ""
 "Toimisto-ohjelmistot: tekstinkäsittely (kword, abiword), taulukkolaskenta "
 "(kspread, gnumeric), pdf-lukijat jne"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Peliasema"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Viihdeohjelmat: tasohyppely, korttipelit, strategia jne"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediatyöasema"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Äänen sekä videon toisto- ja editointiohjelmat"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internettyöasema"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -455,213 +434,195 @@ msgstr ""
 "Valikoima työkaluja sähköpostin ja uutisryhmien lukemiseen (mutt, tin...) "
 "sekä Internetin selailuun"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Verkkopääte (asiakas)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Asiakasohjelmat eri protokollille (SSH jne)"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Työkalut, jotka helpottavat tietokoneesi asetusten muokkaamista"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Komentorivityökalut"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editorit, komentotulkit, tiedostotyökalut, päätteet"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Kehitysympäristö"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C ja C++ kehityskirjastot, ohjelmat ja include-tiedostot"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentaatio"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Kirjoja ja ohjeita Linuxista sekä vapaan lähdekoodin ohjelmista"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 "Linux Standard Base (Linux Standardi Perusta)\n"
 " - Kolmannen osapuolen ohjelmistojen tuki"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "WWW-palvelin"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab palvelin"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Palomuuri / Reititin"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internetin yhdyskäytävä"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Posti/Uutiset"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix sähköpostipalvelin, Inn uutispalvelin"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Hakemisto-palvelin"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-palvelin"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Verkkoalueen nimipalvelin (DNS) ja verkon informaatio-palvelin"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Tiedosto- ja Tulostuspalvelin"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS-palvelin, Samba-palvelin"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Tietokanta"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL ja MySQL tietokantapalvelin"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache WWW-palvelin ja Pro-ftpd FTP-palvelin"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Sähköposti"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix sähköpostipalvelin"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL tai MySQL tietokantapalvelin"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Verkkotietokone (palvelin)"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-, SMB-, välitys- ja SSH-palvelin"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Graafinen ympäristö"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-työasema"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -669,12 +630,12 @@ msgid ""
 msgstr ""
 "K-työpöytäympäristö. Graafinen perusympäristö ja sen mukana tulevat työkalut"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-työasema"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -682,7 +643,7 @@ msgid ""
 msgstr ""
 "Graafinen ympäristö käyttäjäystävällisellä sovelluksilla ja työkaluilla."
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "KDE Työpöytä"
@@ -695,54 +656,52 @@ msgid ""
 msgstr ""
 "Graafinen ympäristö käyttäjäystävällisellä sovelluksilla ja työkaluilla."
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Muut graafiset käyttöympäristöt"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, FVWM jne"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Työkalut"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-palvelin"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin Etäasetuspalvelin"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Verkkotyökalut/Valvonta"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Valvontatyökalut, prosessihallinta, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva Velhoja"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Velhoja palvelimen asettamiseksi"
@@ -843,18 +802,18 @@ msgstr "Työpöydän '%s' esikatselu."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Napsauta kuvia nähdäksesi suuremman esikatselun."
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakettiryhmien valinta"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Yksittäisten pakettien valinta"
 
 # mat
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Koko yhteensä: %d / %d Mt"
@@ -975,12 +934,12 @@ msgstr "Minimaalinen asennus"
 msgid "Software Management"
 msgstr "Ohjelmistohallinta"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Valitse asennettavat paketit"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Asennetaan"
@@ -1008,7 +967,7 @@ msgstr[0] "%d paketti"
 msgstr[1] "%d pakettia"
 
 # Asennuksen sivuvalikko
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Yhteenveto"
@@ -1018,7 +977,7 @@ msgstr "Yhteenveto"
 msgid "Configure"
 msgstr "Aseta"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "ei asetettu"
@@ -1028,7 +987,7 @@ msgstr "ei asetettu"
 msgid "Media Selection"
 msgstr "Lähteiden valinta"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1037,7 +996,7 @@ msgstr ""
 "Seuraavar asennusmediat on löydetty.\n"
 "Jos haluat ohittaa joku niistä, voit poistaa niiden valinta nyt."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1050,7 +1009,7 @@ msgstr ""
 "Asennus jatkaa sen jälkeen kovalevyltä ja paketit ovat käytettävissä myös "
 "asennuksen jälkeen."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopioi koko CD"
@@ -1070,61 +1029,49 @@ msgstr "Valitse näppäimistösi asettelu"
 msgid "Here is the full list of available keyboards:"
 msgstr "Tässä on koko lista käytettävissä olevista näppäimistöistä:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Asenna/Päivitä"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Onko tämä asennus vai päivitys?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Asennus"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Päivitä %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"Päivittäminen 32-bittisestä jakelusta 64-bittiseen jakeluun ei ole tuettu."
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"Päivittäminen 64-bittisestä jakelusta 32-bittiseen jakeluun ei ole tuettu."
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Salausavain %s:lle"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Peruuta asennus, käynnistä järjestelmä uudelleen"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Uusi asennus"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Päivitä edellinen asennus (ei suositella)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1144,17 +1091,17 @@ msgstr ""
 "Varoitus: Varmuuskopioi kaikki omat tiedostosi ennen kuin valitset\n"
 "\"Uusi asennus\"."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Asetetaan IDE-levyä"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1164,7 +1111,7 @@ msgstr ""
 "käynnistääksesi järjestelmän sinun pitää luoda käynnistyslohko-osio "
 "DiskDrake:ssa."
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1175,7 +1122,7 @@ msgstr ""
 "käynnistääksesi järjestelmän sinun pitää luoda käynnistyslohko-osio "
 "DiskDrake:ssa."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1189,19 +1136,19 @@ msgstr ""
 "Jos sinulla ei ole levyä, valitse Peruuta välttääksesi asennukset tältä "
 "levyltä."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Etsitään saatavilla olevia paketteja..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr "Järjestelmässäsi ei ole riittävästi vapaata tilaa (%dMt > %dMt)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1210,52 +1157,52 @@ msgstr ""
 "Lataa tai tallenna pakettien valinta.\n"
 "Muoto on sama kuin auto_install-toiminnon luomilla tiedostoilla."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Verkkokuorma"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Tallenna"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Huono tiedosto"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Työpöydän valinta"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Voit valita asennettavan työpöytäprofiilin."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valittu koko on suurempi kuin käytettävissä oleva levytila"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Asennuksen tyyppi"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1264,82 +1211,82 @@ msgstr ""
 "Et ole valinnut yhtäkään pakettiryhmää.\n"
 "Valitse haluamasi minimaalinen asennus"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X-palvelimella"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Perusdokumentaation kanssa (suositeltu!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Vähimmäisasennus (erityisesti ei urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Valmistellaan asennusta"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Asennetaan pakettia: %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Tapahtui virhe järjestettäessä paketteja:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Jatka kuitenkin?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Yritä uudelleen"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Ohita tämä paketti"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Ohita kaikki paketit medialta \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Siirry takaisin medioiden ja pakettien valintaan"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Paketin %s asentamisessa tapahtui virhe."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Asennuksen jälkeiset toiminnot"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Varmista että Päivitetyt Moduulit media on asemassa %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Päivitykset"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1359,28 +1306,28 @@ msgstr ""
 "\n"
 "Haluatko hakea ja asentaa päivitykset?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s kohteessa %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Laitteisto"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Äänikortti"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Onko sinulla ISA-väylään liitettävä äänikortti?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1389,68 +1336,68 @@ msgstr ""
 "Suorita \"alsaconf\" tai \"sndconfig\" asennuksen jälkeen asettaaksesi "
 "äänikorttisi."
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Yhtäkään äänikorttia ei löydetty. Kokeile \"harddrake\" asennuksen jälkeen"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Graafinen käyttöliittymä"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Verkko & Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Välityspalvelimet"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "asetettu"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Turvataso"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Palomuuri"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktivoitu"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "ei käytössä"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Et ole asettanut X-palvelinta. Oletko varma että haluat tehdä tämän?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Valmistelen käyttöjärjestelmän lataajaa..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1463,7 +1410,7 @@ msgstr ""
 "käyttää BootX:ää koneesi käynnistämiseen. Ytimen paremetrit root "
 "tiedostojärjestelmälle on: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1473,17 +1420,17 @@ msgstr ""
 "ylläpitäjälle."
 
 # mat
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Aseta tyhjä levyke levykeasemaan %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Valmistellaan automaattiasennuslevykettä..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1494,7 +1441,7 @@ msgstr ""
 "\n"
 "Haluatko todella lopettaa?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Onnittelut"
@@ -1641,6 +1588,32 @@ msgid ""
 "Exit"
 msgstr "Poistu"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Työpöytäsi USB-tikulla"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% vapaan lähdekoodin Mandriva Linux -jakelu"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Tutustu Linuxiin helposti Mandriva Onella"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Täysi Mandriva Linux -jakelu käyttäjätuella"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: jakeluja jokaisen tarpeisiin"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Haetaan tiedosto %s ..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Päivittäminen 32-bittisestä jakelusta 64-bittiseen jakeluun ei ole tuettu."
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Päivittäminen 64-bittisestä jakelusta 32-bittiseen jakeluun ei ole tuettu."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/fr.po b/perl-install/install/share/po/fr.po
index d40dac19f..e9a1a9785 100644
--- a/perl-install/install/share/po/fr.po
+++ b/perl-install/install/share/po/fr.po
@@ -74,7 +74,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-03-30 15:52+0200\n"
 "Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
 "Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
@@ -84,31 +84,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2;plural=(n>1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Votre bureau sur une clé USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "La distribution Mandriva Linux 100%% libre"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Découvrez Linux facilement grâce à Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Un bureau Mandriva Linux complet, avec support"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva : les distributions couvrant les besoins de chacun"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -149,17 +124,17 @@ msgstr "Réseau (FTP)"
 msgid "Network (NFS)"
 msgstr "Réseau (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL du miroir ?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "L'URL doit commencer par ftp:// ou http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -167,7 +142,7 @@ msgstr ""
 "Connexion au site Web de Mandriva Linux pour obtenir la liste des serveurs "
 "miroirs disponibles..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -176,47 +151,47 @@ msgstr ""
 "Echec de la connexion au site web de Mandriva Linux pour obtenir la liste "
 "des miroirs disponibles"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Choisissez un serveur miroir d'où télécharger les paquetages"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "Configuration NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Veuillez entrer le nom de machine et le répertoire de votre média NFS"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Le nom d'hôte manque"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Le répertoire doit commencer par « / »"
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Nom d'hôte du montage NFS ?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Répertoire"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Supplémentaire"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -225,22 +200,22 @@ msgstr ""
 "Ne peut trouver le fichier de liste de paquets sur ce miroir. Vérifiez que "
 "l'emplacement est correct."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Recherche des paquetages déjà installés..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Recherche des paquetages à mettre à jour..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Suppression des paquetages avant la mise à jour ..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -262,18 +237,18 @@ msgstr ""
 "système et effectuez cette opération via l'appliquette de mise à jour "
 "Mandriva."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Redémarrage"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Poursuivre"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -287,72 +262,72 @@ msgstr ""
 "\n"
 "Souhaitez-vous réellement les désinstaller ?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erreur lors de la lecture du fichier %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Les disques suivants ont été renommés :"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (précédemment nommé %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Réseau"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Veuillez choisir un média"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Le fichier existe déjà. Voulez-vous l'écraser ?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Mauvais nom NFS"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Média %s incorrect"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Impossible de faire des captures d'écran avant le partitionnement"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Les captures d'écran seront disponibles après l'installation dans %s"
@@ -363,11 +338,15 @@ msgid "Installation"
 msgstr "Installation"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Configuration"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -393,23 +372,23 @@ msgstr "Démarrage de l'interface réseau..."
 msgid "Bringing down the network"
 msgstr "Arrêt de l'interface réseau..."
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Veuillez patienter, récupération du fichier en cours"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Téléchargement du fichier %s ..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 "Copie de certains paquetages sur les disques pour une utilisation future"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Copie en cours"
@@ -453,27 +432,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Une erreur est survenue :"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transactions ont échoué"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "L'installation des paquets a échoué :"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Station de travail"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Poste bureautique"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -482,7 +461,7 @@ msgstr ""
 "Programmes pour la bureautique : traitements de texte (OpenOffice.org "
 "Writer, Kword), tableurs (OpenOffice.org Calc, Kspread), visualiseur pdf, etc"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -491,33 +470,33 @@ msgstr ""
 "Programmes pour la bureautique : traitements de texte (kword, abiword), "
 "tableurs (kspread, gnumeric), visualiseur pdf, etc"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Jeux"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 "Programmes de divertissement : jeux d'arcade, de plateau, de stratégie, etc"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimédia"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programmes pour jouer/éditer du son et de la vidéo"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internet"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -526,212 +505,194 @@ msgstr ""
 "Ensemble d'outils pour lire et envoyer des courriers électroniques et des "
 "messages de forums (mutt, tin, ...), ainsi que pour naviguer sur Internet"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Ordinateur réseau (client)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients pour différents protocoles, dont ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Outils pour faciliter la configuration de votre ordinateur"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Utilitaires console"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Éditeurs, interpréteurs, outils fichiers, terminaux"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Développement"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 "Bibliothèques de développement C et C++, programmes et fichiers d'en-tête"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Documentation"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Livres et Howto's sur Linux et le Logiciel Libre"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "« Linux Standard Base ». Support des programmes tiers"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Serveur Web"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Serveur Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Pare Feu/Routeur"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Passerelle internet"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Courriel/Nouvelles"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Serveur de courrier Postfix, serveur de nouvelles lnn"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Serveur d'annuaire"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Serveur FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Serveur de noms de domaine et d'information réseaux"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Serveur pour partage de fichiers et d'imprimantes"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Serveur NFS, Serveur Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Base de Données"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache et Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Courriel"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Serveur de courrier Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Serveur réseau"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Serveur NFS, serveur SMB, serveur Proxy (mandataire), serveur SSH"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Environnement graphique"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "Station de travail KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -740,12 +701,12 @@ msgstr ""
 "L'environnement graphique KDE (K Desktop Environment) avec sa collection "
 "d'outils"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Station de travail GNOME"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -754,7 +715,7 @@ msgstr ""
 "Un environnement de bureau avec un ensemble de programmes et d'outils "
 "intuitifs"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Bureau LXDE"
@@ -764,56 +725,56 @@ msgstr "Bureau LXDE"
 msgid ""
 "A lightweight & fast graphical environment with user-friendly set of "
 "applications and desktop tools"
-msgstr "Un environnement de bureau léger et rapide avec un ensemble de programmes et d'outils intuitifs"
+msgstr ""
+"Un environnement de bureau léger et rapide avec un ensemble de programmes et "
+"d'outils intuitifs"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Autres Environnements de Bureau"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Utilitaires"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "Serveur SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Serveur de configuration distante webmin"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Utilitaires réseau/Surveillance du réseau"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Outils de surveillance, gestion de processus, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Assistants Mandriva"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Assistants pour configurer le serveur"
@@ -915,17 +876,17 @@ msgstr "Voici un aperçu du bureau « %s »."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Veuillez cliquer sur l'image afin d'agrandir l'aperçu"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Sélection des groupes de paquetages"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Sélection individuelle des paquetages"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Taille totale : %d / %d Mo"
@@ -1043,12 +1004,12 @@ msgstr "Installation minimale"
 msgid "Software Management"
 msgstr "Gestion des paquetages"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Choisissez les paquetages que vous voulez installer"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installation"
@@ -1075,7 +1036,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d paquetage"
 msgstr[1] "%d paquetages"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Résumé"
@@ -1085,7 +1046,7 @@ msgstr "Résumé"
 msgid "Configure"
 msgstr "Configurer"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "non configuré"
@@ -1095,7 +1056,7 @@ msgstr "non configuré"
 msgid "Media Selection"
 msgstr "Sélection des média"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1105,7 +1066,7 @@ msgstr ""
 "Si vous ne désirez pas utiliser certains d'entre eux, vous pouvez les "
 "désélectionner maintenant."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1118,7 +1079,7 @@ msgstr ""
 "Celle-ci s'effectuera alors à partir du disque dur et les paquetages "
 "resteront disponibles une fois le système installé."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copier entièrement les CDs"
@@ -1138,59 +1099,49 @@ msgstr "Veuillez choisir votre type de clavier"
 msgid "Here is the full list of available keyboards:"
 msgstr "Voici la liste complète des claviers disponibles :"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installation/Mise à jour"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Désirez-vous faire une installation ou une mise à jour ?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installation"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Mettre à jour %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "La mise à jour d'une distribution 32bit vers 64bit n'est pas supportée"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "La mise à jour d'une distribution 64bit vers 32bit n'est pas supportée"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Clé de chiffrement pour %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Annuler l'installation, relancer le système"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Nouvelle installation"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Mettre à jour la précédente installation (non recommandé)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1209,17 +1160,17 @@ msgstr ""
 "Attention, vous devriez sauvegarder vos informations personnelles\n"
 "avant de choisir « Nouvelle installation »."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Configuration IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1231,7 +1182,7 @@ msgstr ""
 "de\n"
 "créer la partition d'amorçage avec DiskDrake."
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1244,7 +1195,7 @@ msgstr ""
 "de\n"
 "créer la partition d'amorçage avec DiskDrake."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1258,12 +1209,12 @@ msgstr ""
 "Si vous ne le possédez pas, cliquez sur « Annuler » afin de ne rien installer "
 "à partir de ce CD-ROM."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Recherche des paquetages disponibles..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1272,7 +1223,7 @@ msgstr ""
 "Votre système n'a pas assez d'espace libre pour installer ou de mettre à "
 "jour (%dMo > %dMo)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1282,52 +1233,52 @@ msgstr ""
 "sélection des paquetages. Le format est le même que celui de l'installation "
 "automatisée (auto_install)."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Charger"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Mauvais fichier"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Sélection du bureau"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Vous pouvez choisir un profil de bureau de station de travail ."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "La taille sélectionnée est plus importante que la place disponible"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Type d'installation"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1336,83 +1287,83 @@ msgstr ""
 "Vous n'avez sélectionné aucun groupe de paquetages.\n"
 "Veuillez choisir l'installation minimale désirée :"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Avec X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Avec la documentation de base (recommandé !)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Installation vraiment minimale (et en particulier pas d'urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Préparation de l'installation"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Installation du paquetage %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Erreur lors du tri des paquetages :"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Souhaitez-vous tout de même continuer ?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Ré-essayer"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Ignorer ce paquetage"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Ignorer tous les paquetages du média « %s »"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Retourner à la sélection du média et des paquetages"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Erreur lors de l'installation du paquetage %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuration post-installation"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Assurez vous que le média de mise à jour des modules est dans le lecteur %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Mises à jour"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1433,28 +1384,28 @@ msgstr ""
 "\n"
 "Souhaitez-vous installer les mises à jour ?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s sur %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Matériel"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Carte son"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Possédez-vous une carte son ISA ?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1463,70 +1414,70 @@ msgstr ""
 "Lancez « alsaconf » ou « sndconfig » après l'installation pour configurer la "
 "carte son"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Aucune carte son détectée. Essayez avec « harddrake » après l'installation"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Interface graphique"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Réseau et Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxys"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "configuré"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Niveau de sécurité"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Pare Feu"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "activé"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "désactivé"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Vous n'avez pas configuré le serveur d'affichage (X11). Êtes-vous sûr de ce "
 "que vous faites ?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Préparation du programme d'amorçage..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Merci d'être patient, cela peut prendre quelques instants"
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1541,7 +1492,7 @@ msgstr ""
 "d'une autre méthode pour démarrer votre machine. Le paramètre pour la racine "
 "du noyau est : root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1550,17 +1501,17 @@ msgstr ""
 "A ce niveau de sécurité, l'accès aux fichiers de la partition Windows sera "
 "restreint à l'administrateur."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Insérez une disquette vierge dans le lecteur %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Création de la disquette d'auto-installation..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1571,7 +1522,7 @@ msgstr ""
 "\n"
 "Souhaitez-vous vraiment quitter maintenant ?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Félicitations"
@@ -1714,3 +1665,29 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Quitter"
+
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Votre bureau sur une clé USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "La distribution Mandriva Linux 100%% libre"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Découvrez Linux facilement grâce à Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Un bureau Mandriva Linux complet, avec support"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva : les distributions couvrant les besoins de chacun"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Téléchargement du fichier %s ..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "La mise à jour d'une distribution 32bit vers 64bit n'est pas supportée"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "La mise à jour d'une distribution 64bit vers 32bit n'est pas supportée"
diff --git a/perl-install/install/share/po/fur.po b/perl-install/install/share/po/fur.po
index a99990035..dc1866f8b 100644
--- a/perl-install/install/share/po/fur.po
+++ b/perl-install/install/share/po/fur.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2004-06-28 17:41+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -15,31 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -75,92 +50,92 @@ msgstr "Rêt"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr ""
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Cartele"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr ""
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -172,18 +147,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Torne a inviâ"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -192,72 +167,72 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr ""
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr ""
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "HFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Rêt"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Par plasè sielç"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr ""
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Permès dineât"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "font zontade %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr ""
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
@@ -268,11 +243,15 @@ msgid "Installation"
 msgstr "Instale"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Configurazion"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -295,22 +274,22 @@ msgstr ""
 msgid "Bringing down the network"
 msgstr ""
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
+msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Instalazion in vore"
@@ -352,296 +331,278 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Al è intravignût un fal"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Instalazion falade"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Instale atualizazions"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "Viôt le Configurazion"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
 "(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Multimedia"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "Internazionalizazion"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Informatiche"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, fuzzy, c-format
 msgid "Console Tools"
 msgstr "Console"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Svilup"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Documentazion"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Server Web"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "Grop"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, fuzzy, c-format
 msgid "Kolab Server"
 msgstr "Server Web"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/File/_Gnûf"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "Ferme Server"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "FTP Server"
 msgstr "Server NTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Server Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, fuzzy, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Mail"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "Informatiche"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ambient Grafic"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Desktop"
@@ -653,54 +614,52 @@ msgid ""
 "applications and desktop tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, fuzzy, c-format
 msgid "Other Graphical Desktops"
 msgstr "Desktop grafic"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, fuzzy, c-format
 msgid "Utilities"
 msgstr "Filipinis"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Viôt le Configurazion"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "<b>Mandriva Expert</b>"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr ""
@@ -792,17 +751,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr ""
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr ""
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr ""
@@ -919,12 +878,12 @@ msgstr ""
 msgid "Software Management"
 msgstr "Gjestôr Software"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr ""
@@ -951,7 +910,7 @@ msgid_plural "%d packages"
 msgstr[0] "pachet no cognossût"
 msgstr[1] "pachet no cognossût"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr ""
@@ -961,7 +920,7 @@ msgstr ""
 msgid "Configure"
 msgstr "Configure"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr ""
@@ -971,14 +930,14 @@ msgstr ""
 msgid "Media Selection"
 msgstr "Selezion dal percors"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -987,7 +946,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1007,59 +966,49 @@ msgstr ""
 msgid "Here is the full list of available keyboards:"
 msgstr ""
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr ""
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instale"
 
-#: steps_interactive.pm:147
-#, c-format
-msgid "Upgrade %s"
-msgstr ""
-
 #: steps_interactive.pm:151
 #, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgid "Upgrade %s"
 msgstr ""
 
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Instale"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1071,24 +1020,24 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr ""
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1096,7 +1045,7 @@ msgid ""
 "DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1105,153 +1054,153 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr ""
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, fuzzy, c-format
 msgid "Load"
 msgstr "Locâl"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Salve"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Salve il file"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr ""
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr ""
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr ""
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr ""
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr ""
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr ""
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr ""
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Atualizazions"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1264,95 +1213,95 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr ""
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr ""
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr ""
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr ""
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Rêt & Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr ""
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr ""
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Nivel di Sigurece"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "disabilitât"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr ""
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1361,24 +1310,24 @@ msgid ""
 "root fs is: root=%s"
 msgstr ""
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr ""
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1386,7 +1335,7 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Congratulazions"
diff --git a/perl-install/install/share/po/ga.po b/perl-install/install/share/po/ga.po
index c9d920709..2ed94d831 100644
--- a/perl-install/install/share/po/ga.po
+++ b/perl-install/install/share/po/ga.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2005-09-12 18:04+0200\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -13,31 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -73,92 +48,92 @@ msgstr "Líonra (FTP)"
 msgid "Network (NFS)"
 msgstr "Líonra (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr ""
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "Cumraigh NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Comhadlann"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Earráid ag oscailt %s do scríobh: %s"
 
-#: any.pm:328
+#: any.pm:334
 #, fuzzy, c-format
 msgid "Looking at packages already installed..."
 msgstr "Roghnaigh pacáistí ..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Ag cúrdach pacáistí le húasgrádú..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -170,18 +145,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Atosaigh"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -190,72 +165,72 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Earráid ag léamh comhad %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Roghnaigh pacáistí ..."
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Líonra"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Roghnaight do theangam le do thoil."
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Tá an comhad ann cheana. Forscríobh?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Cead diúltaithe"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "Tá comhad %s lódailte."
 
-#: any.pm:1236
+#: any.pm:1242
 #, fuzzy, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Ní féidir liom rann eile a cur isteach"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
@@ -266,11 +241,15 @@ msgid "Installation"
 msgstr "Suiteáil"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "cumraíocht"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -293,22 +272,22 @@ msgstr "Ag tosnú suas an ghréasán"
 msgid "Bringing down the network"
 msgstr "Ag dúnadh síos an ghreasán"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Sabháil i gcomhad"
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Pointe taca dublach %s"
@@ -350,296 +329,278 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Tharla earráid"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Theip ag feistiú"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Ag feistiál  pacáiste %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Stáisiún Oibre"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Stáisiún Oibre"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
 "(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Stáisiún Cluichí"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Stáisiún ilmheánach"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Stáisiún Idirlíon"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Printéir Gréasán (lpd)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Uirlisí Consóil"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Forbairt"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Doiciméadú"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Freastalaí Lín"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Grúpearraí"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Freastalaí Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, fuzzy, c-format
 msgid "Internet gateway"
 msgstr "suimiúil"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Ríomhphost/Nuacht"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Freastalaí Printéir"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Freastalaí Eolaire"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Freastalaí FTP:"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS "
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Ainm Fearannas"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Freastalaí Printéir"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Freastalaí NIS"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Bunachar Sonraí"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Greasan/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Post"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, fuzzy, c-format
 msgid "Postfix mail server"
 msgstr "Freastalaí Printéir"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "Cláréadan Gréasán"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Timpeallacht Ghrafach"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "Stáisiún KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Stáisiún Gnome"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Deasc"
@@ -651,54 +612,52 @@ msgid ""
 "applications and desktop tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Deasc Graphaicí Eile"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Uirlisí"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "Freastalaí SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Seirbishí"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Cumraigh Idirlíon"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Cumraíocht Gréasánú"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "Bainteach le hIdirlíon"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Cumraigh printéir"
@@ -790,17 +749,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Roghnú Grúpa Pacáistí"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr ""
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Méid iomlán: %d / %d MB"
@@ -917,12 +876,12 @@ msgstr "Eirigh as Feistiú"
 msgid "Software Management"
 msgstr "Bainistíocht Bhogearraí"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Ag Feistiú"
@@ -949,7 +908,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pacáistí"
 msgstr[1] "%d pacáistí"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Coimriú"
@@ -959,7 +918,7 @@ msgstr "Coimriú"
 msgid "Configure"
 msgstr "Cumraigh"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "Cumraigh"
@@ -969,14 +928,14 @@ msgstr "Cumraigh"
 msgid "Media Selection"
 msgstr "Roghnú Grúpa Pacáistí"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -985,7 +944,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1005,59 +964,49 @@ msgstr "Roghnaigh leagan amach do mhéarchláir"
 msgid "Here is the full list of available keyboards:"
 msgstr ""
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, fuzzy, c-format
 msgid "Install/Upgrade"
 msgstr "Feistiúi/Uadgrádaigh"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, fuzzy, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Feistigh nó uasgrádaigh ?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Feistiú"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, fuzzy, c-format
 msgid "Upgrade %s"
 msgstr "Uasgrádaigh"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, fuzzy, c-format
 msgid "Encryption key for %s"
 msgstr "Ní mar a chéile na pasfhocail"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Suiteáil"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1069,24 +1018,24 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Ag cumraigh IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1094,7 +1043,7 @@ msgid ""
 "DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1103,153 +1052,153 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Ag curdach do na pacáistí atá ar fáil..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Lód"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Sábháil"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Lódáil comhad"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Roghnú Grúpa Pacáistí"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, fuzzy, c-format
 msgid "Type of install"
 msgstr "Roghnaigh pacáistí a feistiú ..."
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Le X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Ag Ullmhaigh feistiú"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Ag feistiál  pacáiste %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Lean ar aghaidh ar aon nós?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Atriail"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Roghnú Grúpa Pacáistí"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Ag feistiál  pacáiste %s"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Cumraíocht Iar-feistú"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Leasuithe"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1262,95 +1211,95 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s ar %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Crua-earraí"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Carta Fuaim"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, fuzzy, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "An bhfuil ceann eile agat?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Comhéadan grafach"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Gréasán agus Idirlíon"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Ionadaithe"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "cumraithe"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Leibhéal Slándála"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Bac slándála"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "díchumasaithe"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Ag Ullmhaigh ríomhchlar thosnaithe..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1359,24 +1308,24 @@ msgid ""
 "root fs is: root=%s"
 msgstr ""
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Cur isteach diosca folamh sa dioscthiomant %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr ""
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1384,7 +1333,7 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Comhghairdeas"
@@ -1529,6 +1478,10 @@ msgid ""
 msgstr "Scoir"
 
 #, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Sabháil i gcomhad"
+
+#, fuzzy
 #~ msgid "IceWm Desktop"
 #~ msgstr "Deasc"
 
diff --git a/perl-install/install/share/po/gl.po b/perl-install/install/share/po/gl.po
index be1c8c85e..aa0be4fb7 100644
--- a/perl-install/install/share/po/gl.po
+++ b/perl-install/install/share/po/gl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2008-04-13 20:40+0100\n"
 "Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -18,31 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "O seu escritorio nunha chave USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "A distribución de Mandriva Linux 100%% código aberto"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Explore Linux de forma sinxela con Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Un escritorio Mandriva Linux completo, son soporte"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distribucións para as necesidades de cada un"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -82,17 +57,17 @@ msgstr "Rede (FTP)"
 msgid "Network (NFS)"
 msgstr "Rede (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Cal é o URL do sitio espello?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "O URL debe comezar por ftp:// ou por http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -100,7 +75,7 @@ msgstr ""
 "Contactando co sitio web de Mandriva Linux para obte-la lista de sitios "
 "espello dispoñibles..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -109,47 +84,47 @@ msgstr ""
 "Fallo ó contactar co sitio web de Mandriva Linux para obte-la lista de "
 "sitios espello dispoñibles"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Escolla un sitio espello dende o que obte-los paquetes"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "Configuración de NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Introduza o nome de máquina e o directorio do soporte NFS"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Falta o nome de máquina"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "O directorio debe comezar por \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, fuzzy, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Cal é o nome de máquina da montaxe NFS?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Directorio"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -158,22 +133,22 @@ msgstr ""
 "Non se puido atopar un ficheiro de lista de paquetes neste sitio espello.\n"
 "Asegúrese de que a localización é a correcta."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Buscando os paquetes que xa están instalados..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Buscando paquetes para actualizar..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Eliminando paquetes antes de actualizar..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -185,18 +160,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -210,72 +185,72 @@ msgstr ""
 "\n"
 "Desexa eliminar estes paquetes?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erro ó le-lo ficheiro %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Renomeáronse os seguintes discos:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (chamado anteriormente %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Rede"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Escolla un soporte"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "O ficheiro xa existe. ¿Desexa sobreescribilo?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nome NFS incorrecto"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "O soporte %s é incorrecto"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Non se pode captura-la pantalla antes de face-las particións"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Poderanse facer capturas de pantalla despois de instalar en %s"
@@ -286,11 +261,15 @@ msgid "Installation"
 msgstr "Instalación"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Configuración"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -315,22 +294,22 @@ msgstr "Activando a rede"
 msgid "Bringing down the network"
 msgstr "Desactivando a rede"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Descargando o ficheiro %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Copiando algúns paquetes dos discos para un uso posterior"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Copiando"
@@ -374,27 +353,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Ocorreu un erro"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "fallaron %d transaccións de instalación"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Instalando o paquete %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Estación de traballo"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Estación de Traballo de Oficina"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -403,7 +382,7 @@ msgstr ""
 "Programas de oficina: procesadores de texto (OpenOffice.org Writer, Kword), "
 "follas de cálculo (OpenOffice.org Calc, Kspread), visualizadores de pdf, etc"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -412,32 +391,32 @@ msgstr ""
 "Programas de oficina: procesadores de texto (kword, abiword), follas de "
 "cálculo (kspread, gnumeric), visualizadores de pdf, etc"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Estación de xogos"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programas de diversión: arcade, taboleiros, estratexia, etc"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Estación multimedia"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programas de reproducción e edición de son e vídeo"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Estación de Internet"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -446,212 +425,194 @@ msgstr ""
 "Conxunto de ferramentas para ler e enviar correo-e e novas (mutt, tin...) e "
 "para navegar pola Web"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Ordenador de Rede (cliente)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clientes para diferentes protocolos incluíndo ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ferramentas para facilita-la configuración do ordenador"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Ferramentas de Consola"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editores, shells, ferramentas de ficheiro, terminais"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Desenvolvemento"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 "Bibliotecas de desenvolvemento de C e C++, programas e ficheiros include"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Documentación"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Libros e Howtos sobre Linux e o Software Libre"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Soporte para aplicacións de terceiros"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Servidor Web"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Servidor Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Cortalumes/Encamiñador"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Pasarela de Internet"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Correo/Novas"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Servidor de correo Postfix, servidor de novas Inn"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Servidor de Directorio"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Servidor FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Servidor de Nomes de Dominio e Información de Rede"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Servidor de Compartimento de Impresoras e Ficheiros"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Servidor NFS, servidor Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Bases de datos"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Servidores de bases de datos PostgreSQL e MySQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Correo-e"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Servidor de correo Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "Servidores de bases de datos PostgreSQL ou MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Servidor de Redes de Ordenadores"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor ssh"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ambiente Gráfico"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "Estación de Traballo KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -660,12 +621,12 @@ msgstr ""
 "O Ambiente de Escritorio KDE, o ambiente gráfico básico cunha colección de "
 "ferramentas que o acompañan"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Estación de Traballo GNOME"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -674,7 +635,7 @@ msgstr ""
 "Un ambiente gráfico cun conxunto de aplicacións amigables e ferramentas de "
 "escritorio"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Escritorio IceWm"
@@ -688,55 +649,53 @@ msgstr ""
 "Un ambiente gráfico cun conxunto de aplicacións amigables e ferramentas de "
 "escritorio"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Outros Escritorios Gráficos"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Utilidades"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "Servidor SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Servidor de Configuración Remota Webmin"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Monitorización/Utilidades de Rede"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 "Ferramentas de monitorización, accounting de procesos, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Asistentes de Mandriva"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Asistentes para configurar o servidor"
@@ -836,17 +795,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Selección de Grupos de Paquetes"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Selección individual de paquetes"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Tamaño total: %d / %d MB"
@@ -965,12 +924,12 @@ msgstr "Instalación mínima"
 msgid "Software Management"
 msgstr "Xestión do Software"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Escolla os paquetes que desexa instalar"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalando"
@@ -997,7 +956,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d paquete"
 msgstr[1] "%d paquetes"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Resumo"
@@ -1007,7 +966,7 @@ msgstr "Resumo"
 msgid "Configure"
 msgstr "Configurar"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "non configurado"
@@ -1017,7 +976,7 @@ msgstr "non configurado"
 msgid "Media Selection"
 msgstr "Selección de Grupos de Paquetes"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1026,7 +985,7 @@ msgstr ""
 "Atopáronse os seguintes soportes de instalación.\n"
 "Se desexa saltar algún deles, pode deseleccionalo agora."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1039,7 +998,7 @@ msgstr ""
 "Esta continuará despois dende o disco duro e os paquetes permanecerán "
 "dispoñibles unha vez que o sistema xa estea instalado."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copiar CDs enteiros"
@@ -1059,63 +1018,49 @@ msgstr "Escolla a disposición do seu teclado"
 msgid "Here is the full list of available keyboards:"
 msgstr "Esta é a lista completa dos teclados dispoñibles"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalar/Actualizar"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "¿É unha instalación ou unha actualización?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalación"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Actualizar %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"Non está soportada a actualización dende unha distribución de 32 bits a unha "
-"de 64 bits"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"Non está soportada a actualización dende unha distribución de 64 bits a unha "
-"de 32 bits"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Clave de cifrado para %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Instalación"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1127,17 +1072,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Configurando IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1147,7 +1092,7 @@ msgstr ""
 "pero para arrincar o seu sistema, cómpre crear a partición bootstrap en "
 "DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, fuzzy, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1158,7 +1103,7 @@ msgstr ""
 "instalación vai continuar, pero para arrincar o sistema, terá que a "
 "partición bootstrap con DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1170,12 +1115,12 @@ msgstr ""
 "Insira o CD-ROM que teña a etiqueta \"%s\" na unidade e prema Aceptar.\n"
 "Se non o ten, prema Cancelar para omiti-la instalación deste CD-ROM."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Buscando os paquetes dispoñibles..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1184,7 +1129,7 @@ msgstr ""
 "O seu sistema non ten espacio libre dabondo para a instalación ou "
 "actualización (%dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1193,54 +1138,54 @@ msgstr ""
 "Elixa cargar ou gardar a selección de paquetes.\n"
 "O formato é o mesmo có dos ficheiros xerados por auto_install."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Cargar"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Gardar"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Ficheiro erróneo"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Selección de Grupos de Paquetes"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, fuzzy, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 "Pode elixir o seu perfil de escritorio de estación de traballo: KDE, GNOME "
 "ou Personalizado"
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "O tamaño seleccionado é maior có tamaño dispoñible"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipo de instalación"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1249,83 +1194,83 @@ msgstr ""
 "Non seleccionou ningún grupo de paquetes.\n"
 "Seleccione a instalación mínima que desexa:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Con X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Ca documentación básica (¡recomendado!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instalación realmente mínima (especialmente sen urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Preparando a instalación"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalando o paquete %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Houbo un erro ó ordena-los paquetes:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "¿Continuar de tódolos xeitos?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Volver tentar"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Omitir este paquete"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Omitir tódolos paquetes do soporte \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Volver a soportes e selección de paquetes"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Houbo un erro ó instala-ls paquetes %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuración trala instalación"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Asegúrese de que o soporte de Módulos de Actualización está na unidade %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Actualizacións"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1346,28 +1291,28 @@ msgstr ""
 "\n"
 "Desexa instala-las actualizacións?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s en %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Tarxeta de son"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Ten unha tarxeta de son ISA?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1376,69 +1321,69 @@ msgstr ""
 "Execute \"alsaconf\" ou \"sndconfig\" despois da instalación para configura-"
 "la tarxeta de son"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Non se detectou ningunha tarxeta de son. Execute \"harddrake\" trala "
 "instalación"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Interface Gráfica"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Rede & Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxys"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "configurado"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Nivel de Seguridade"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Cortalumes"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "activado"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "desactivado"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Non configurou as X. Está seguro de que desexa isto?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Preparando o cargador de arrinque..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1451,7 +1396,7 @@ msgstr ""
 "continuar, pero ha ter que usar BootX ou algún outro recurso para arrincar a "
 "máquina. O argumento do kernel para o sistema de ficheiros raíz é: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1460,17 +1405,17 @@ msgstr ""
 "Con este nivel de seguridade, o acceso ós ficheiros da partición Windows "
 "está restrinxido ó administrador."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Insira un disquete baleiro na unidade %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Creando un disquete de instalación automática..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1481,7 +1426,7 @@ msgstr ""
 "\n"
 "Desexa saír agora?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Noraboa"
@@ -1625,6 +1570,34 @@ msgid ""
 "Exit"
 msgstr "Sair"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "O seu escritorio nunha chave USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "A distribución de Mandriva Linux 100%% código aberto"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Explore Linux de forma sinxela con Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Un escritorio Mandriva Linux completo, son soporte"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distribucións para as necesidades de cada un"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Descargando o ficheiro %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Non está soportada a actualización dende unha distribución de 32 bits a "
+#~ "unha de 64 bits"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Non está soportada a actualización dende unha distribución de 64 bits a "
+#~ "unha de 32 bits"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/he.po b/perl-install/install/share/po/he.po
index 4fa534768..25da0658e 100644
--- a/perl-install/install/share/po/he.po
+++ b/perl-install/install/share/po/he.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2008-09-30 18:23+0200\n"
 "Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
 "Language-Team: Hebrew\n"
@@ -24,31 +24,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "שולחן העבודה שלך במפתח USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "הפצת מנדריבה לינוקס שהיא 100%% קוד פתוח"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "בדוק את לינוקס בקלות עם מנדריבה One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "שולחן עבודה מלא של מנדריבה לינוקס, עם תמיכה"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "מנדריבה: הפצות לצרכים של כל אחד"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -88,70 +63,70 @@ msgstr "רשת (FTP)"
 msgid "Network (NFS)"
 msgstr "רשת (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "כתובת URL של אתר המראה?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "על הכתובת להתחיל ב-//:ftp או ב-//:http"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "מתחבר לאתר מנדריבה לינוקס בכדי לקבל רשימה של אתרי מראה זמינים..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr "כשל בחיבור לאתר מנדריבה לינוקס בכדי לקבל רשימה של אתרי מראה זמינים"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "עליך לבחור את אתר המראה ממנו יורדו החבילות"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "הגדרת NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "נא להזין את שם המארח ואת התיקיה בה נמצא מקור ה-NFS"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "שם המארח חסר"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "על התיקיה להתחיל ב=\"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "שם המארח של עיגון ה-NFS?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "ספרייה"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "תוספים"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -159,22 +134,22 @@ msgid ""
 msgstr ""
 "אין אפשרות למצוא קובץ המכיל רשימת חבילות במקור זה. נא לוודא שהכתובת תקינה."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "מחפש חבילות שכבר מותקנות..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "מאתר חבילות שיש לשדרג..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "מסיר חבילות לפני השדרוג..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -186,18 +161,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "הפעלה מחדש"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -210,72 +185,72 @@ msgstr ""
 "\n"
 "האם באמת ברצונך להסיר חבילות אלה?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "שגיאה בקריאת הקובץ %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "שמות הכוננ(ים) הבאים שונו:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (השם הקודם הוא %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "רשת"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "עליך לבחור מקור"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "הקובץ כבר קיים. לשכתב?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "הגישה נדחתה"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "שם NFS לא-תקין"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "המקור %s אינו תקין"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "אין אפשרות לשמור תמונות מסך לפני חלוקה למחיצות"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "ניתן למצוא את תמונות המסך אחרי התקנה ב%s"
@@ -286,11 +261,15 @@ msgid "Installation"
 msgstr "התקנה"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "הגדרות"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -315,22 +294,22 @@ msgstr "מאתחל את שירותי הרשת"
 msgid "Bringing down the network"
 msgstr "מוריד את שירותי הרשת"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "מוריד קובץ %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "מעתיק מספר חבילות על הכוננים לשימוש עתידי"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "מעתיק את התקליטור לכונן הקשיח"
@@ -374,27 +353,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "חלה שגיאה"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d התקנות נכשלו"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "מתקין חבילה %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "תחנת עבודה"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "תחנת עבודה משרדית"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -403,7 +382,7 @@ msgstr ""
 "תוכנות משרד: מעבדי תמלילים (כתבן אופן אופיס, Kword), גיליונות אלקטרונים "
 "(גיליון אופן אופיס, Kspread),מציגי pdf, ועוד"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -412,32 +391,32 @@ msgstr ""
 "תוכנות משרד: מעבדי טקסט (kword, abiword), גיליונות אלקטרונים (kspread, "
 "gnumeric),מציגי pdf, ועוד"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "תחנת עבודה למשחקים"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "תוכנות לבידור: ארקייד, לוח, אסטרטגיה, ועוד"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "תחנת עבודה למולטימדיה"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "תוכנות להשמעה או עריכה של קול ווידאו"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "תחנת עבודה לאינטרנט"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -445,230 +424,212 @@ msgid ""
 msgstr ""
 "ערכת כלים לקריאה וכתיבת דוא\"ל וחדשות  (pine, mutt, tin..) ולגלישה באינטרנט"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "מחשב רשת (לקוח)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "לקוחות לפרוטוקולים שונים כולל ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "כלי עזר לביצוע הגדרות המחשב שלך"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "כלי מסוף"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "עורכים, מעטפות, כלי קבצים, מסופים"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "פיתוח"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "ספריות פיתוח בC וC++, תוכנות וקבצי include"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "מסמכים"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "ספרים ומדריכים לשימוש בלינוקס ותוכנה חופשית"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "תמיכה בתוכנות צד שלישי. Linux Standard Base"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "שרת איחסון אתרים"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "עבודה בקבוצה"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "שרת Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "חומת אש/נתב"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "הגנת המערכת בעת חיבור לאינטרנט"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "דואר/קבוצות דיון"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "שרת דואר Postfix, שרת קבוצות דיון Inn"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "שרת ספרייה"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "שרת FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "שרת שמות מתחם ומידע רשת"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "שרת שיתוף קבצים ומדפסות"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "שרת NFS, שרת סמבה"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "מסדי נתונים"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "שרת מסד נתונים MySQL או PostgreSQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "דואר"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "שרת דואר Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "שרת מסד נתונים MySQL או PostgreSQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "שרת מחשב רשת"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "שרת NFS, שרת SMB, שרת Proxy, שרת ssh"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "סביבה גרפית"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "סביבת העבודה KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש עם מגוון יישומים נלווים"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "סביבת העבודה GNOME"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש עם מגוון יישומים נלווים"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "שולחן עבודה IceWm"
@@ -680,54 +641,52 @@ msgid ""
 "applications and desktop tools"
 msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש עם מגוון יישומים נלווים"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "סביבות עבודה אחרות"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "סביבות עבודה קלילות כגון Window Maker, Enlightenment, Fvwm, ועוד"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "תוכנות שרות"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "שרת SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "שרת הגדרה תצורה מרחוק Webmin"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "כלי הגדרת וניטור רשת"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "כלי ניטור, בקרת תהליכים, tcpdump , nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "אשפי מנדריבה"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "אשפים להגדרת השרת שלך"
@@ -825,17 +784,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "בחירת קבוצת חבילות לפי נושא"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "בחירת חבילות באופן פרטני"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "גודל כללי: %d / %d MB"
@@ -952,12 +911,12 @@ msgstr "התקנה מינימלית"
 msgid "Software Management"
 msgstr "תוכנות"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "עליך לבחור את החבילות שברצונך להתקין:"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "מתקין"
@@ -984,7 +943,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d חבילה"
 msgstr[1] "%d חבילות"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "סיכום ובדיקת הגדרות"
@@ -994,7 +953,7 @@ msgstr "סיכום ובדיקת הגדרות"
 msgid "Configure"
 msgstr "הגדרות"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "לא מוגדר"
@@ -1004,7 +963,7 @@ msgstr "לא מוגדר"
 msgid "Media Selection"
 msgstr "בחירת קבוצת חבילות לפי נושא"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1013,7 +972,7 @@ msgstr ""
 "מקורות התוכנה הבאים זמינים להתקנה.\n"
 "באפשרותך לדלג על חלק מהמקורות על ידי ביטול הסימונים המתאימים."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1025,7 +984,7 @@ msgstr ""
 "אם אפשרות זו מופעלת, ההתקנה תמשיך מהכונן הקשיח, וכל החבילות מתקליטורי ההתקנה "
 "יהיו זמינות אחרי סיום ההתקנה מהכונן הקשיח."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "העתקת תקליטורים שלמים"
@@ -1045,59 +1004,49 @@ msgstr "בשלב זה עליך להגדיר את פרישת המקלדת שלך"
 msgid "Here is the full list of available keyboards:"
 msgstr "להלן הרשימה המלאה של המדפסות הזמינות"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "התקנה/עדכון"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "האם זו התקנה או שידרוג?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "התקנה"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "שידרוג %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "שדרוג מהפצת 32ביט להפצת 64ביט אינו נתמך"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "שרוג מהפצת 64ביט להפצת 32 ביט אינו נתמך"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "מפתח הצפנה עבור %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "התקנה"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1109,17 +1058,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "מגדיר IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1128,7 +1077,7 @@ msgstr ""
 "לא נמצא מקום פנוי עבור bootstrap בגודל 1MB! ההתקנה תמשיך, אבל בכדי לאתחל את "
 "המערכת שלך, יהיה עליך ליצור מחיצת bootstrap באופן ידני בעזרת DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1138,7 +1087,7 @@ msgstr ""
 "עליך ליצור PPC PReP Boot bootstrap! ההתקנה תמשיך, אבל בכדי  לאתחל את המערכת "
 "יהיה עליך ליצור מחיצת bootstrap באופן ידני בעזרת DiskDrak "
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1152,19 +1101,19 @@ msgstr ""
 "ולאחר מכן ללחוץ על כפתור \"אישור\". אם תקליטור זה אינו ברשותך,\n"
 "עליך ללחוץ על כפתור \"ביטול\" בכדי לדלג על התקנת חבילות אלו."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "מחפש חבילות זמינות..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr "למערכת שלך לא נותר די מקום להתקנה או שדרוג (%dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1173,53 +1122,53 @@ msgstr ""
 "עליך לבחור באם לטעון או לשמור את בחירת החבילות.\n"
 "מבנה הקובץ זהה לקובץ auto_install הנוצר באופן אוטומטי."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "הספק"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "שמור"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "קובץ לא-תקין"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "בחירת קבוצת חבילות לפי נושא"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, fuzzy, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 "באפשרותך לבחור את מתאר שולחן העבודה של התחנה שלך: KDE, GNOME או מותאם אישית"
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "הגודל הנבחר גדול יותר מהמקום הזמין"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "סוג ההתקנה"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1228,82 +1177,82 @@ msgstr ""
 "לא נבחרה אף קבוצה של חבילות.\n"
 "נא לבחור את ההתקנה המינימלית שברצונך לבצע:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "עם סביבה גרפית (X)"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "עם מסמכים בסיסיים (מומלץ!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "התקנה מינימלית אמיתית (בייחוד לא urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "מכין את ההתקנה"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "מתקין חבילה %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "התרחשה שגיאה בסידור חבילות:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "האם להמשיך בכל מקרה?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "ניסיון נוסף"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "דלג על חבילה זו"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "דלג על כל החבילות ממקור \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "חזרה לבחירת מקורות וחבילות"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "חלה שגיאה בהתקנת החבילה %s"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "מבצע הגדרות לאחר-התקנה"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "נא לודא שהמקור לעידכונים בכונן %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "עדכונים"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1322,28 +1271,28 @@ msgstr ""
 "להורדת חבילות אלה נדרש חיבור אינטרנט עובד. האם ברצונך לעדכן את המערכת בשלב "
 "זה ?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s על %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "חומרה"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "כרטיס קול"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "האם יש לך כרטיס קול ISA?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1352,67 +1301,67 @@ msgstr ""
 "עליך להריץ את \"alsaconf\" או \"sndconfig\" אחרי ההתקנה בכדי להגדיר את כרטיס "
 "הקול שלך"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "לא זוהו כרטיסי קול. יש לנסות את האשף \"harddrake\"  לאחר ההתקנה"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "ממשק גרפי"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "רשת ואינטרנט"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "שרתים מתווכים"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "מוגדר"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "סף האבטחה המבוקש:"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "חומת אש"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "פועל"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "מנותק"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "לא הוגדר ממשק גרפי (X). האם אכן ברצונך לבחור אפשרות זו?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "מכין את מנהל האתחול..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1424,24 +1373,24 @@ msgstr ""
 "במקרה זה. ההתקנה תמשך אבל יהיה עליך להשתמש ב-BootX או באמצעי אחר לאתחול "
 "המערכת. משנה גלעין המערכת למערכת קבצי השורש הוא: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr "ברמת אבטחה זו, גישה לקבצים במחיצת החלונות תתאפשר רק למנהל המערכת."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "נא להכניס תקליטון ריק לכונן %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "יוצר תקליטון הפעלה אוטומטית..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1452,7 +1401,7 @@ msgstr ""
 "\n"
 "האם באמת ברצונך לצאת עכשיו?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "ברכותינו!"
@@ -1596,6 +1545,30 @@ msgid ""
 "Exit"
 msgstr "יציאה"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "שולחן העבודה שלך במפתח USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "הפצת מנדריבה לינוקס שהיא 100%% קוד פתוח"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "בדוק את לינוקס בקלות עם מנדריבה One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "שולחן עבודה מלא של מנדריבה לינוקס, עם תמיכה"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "מנדריבה: הפצות לצרכים של כל אחד"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "מוריד קובץ %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "שדרוג מהפצת 32ביט להפצת 64ביט אינו נתמך"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "שרוג מהפצת 64ביט להפצת 32 ביט אינו נתמך"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/hi.po b/perl-install/install/share/po/hi.po
index 7505e2a94..f7a4f80ee 100644
--- a/perl-install/install/share/po/hi.po
+++ b/perl-install/install/share/po/hi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2004-04-04 21:54+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी (Hindi) <dysxhi@yahoo.co.in>\n"
@@ -16,31 +16,6 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -76,17 +51,17 @@ msgstr "%s नेटवर्क"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -94,7 +69,7 @@ msgstr ""
 "उपलब्ध मिररों की सूची को प्राप्त करने के लिए मैनड्रिव लिनक्स वेब-स्थल से सम्पर्क किया जा "
 "रहा है..."
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -103,69 +78,69 @@ msgstr ""
 "उपलब्ध मिररों की सूची को प्राप्त करने के लिए मैनड्रिव लिनक्स वेब-स्थल से सम्पर्क किया जा "
 "रहा है..."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "एक मिरर का चयन करें जहाँ से पैकेजों को प्राप्त करना है"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "डिरेक्ट्री"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "%s को %s पर नहीं पाया जा सका"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "पहिले से संसाधित पैकेजों को देखा जा रहा है..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "उन्नयन के लिये पैकेजों को खोजा जा रहा है..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -177,18 +152,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "रीबूट"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -201,72 +176,72 @@ msgstr ""
 "\n"
 "क्या वास्तव में इन पैकेजों को हटाना चाहते है?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s संचिका को पढ़ने में त्रुटि"
 
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "निम्नलिखित पैकेजों का संसाधन करना आवश्यक है:\n"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "एचटीटीपी"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "एफटीपी"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "एनएफ़एस"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "नेटवर्क"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "कृपया चयन करें"
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "फाईल पहले से है पुन बनाएँ"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "अनुमति नहीं है"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "%s माध्यम को जोड़ा गया"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "विभाजनीकरण के पूर्व स्क्रीन-चित्र-माला को नहीं लिया जा सकता है"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "%s में संसाधन के उपरान्त स्क्रीन चित्र-माला उपलब्ध होगी"
@@ -277,11 +252,15 @@ msgid "Installation"
 msgstr "संसाधन हो रहा है"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "संरचना"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -307,22 +286,22 @@ msgstr "नेटवर्क को लाया जा रहा है"
 msgid "Bringing down the network"
 msgstr "नेटवर्क को लाया जा रहा है"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "संचिकायें प्रेषित की जा रही..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "खोज जारी है"
@@ -364,27 +343,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "एक त्रुटि हो गयी है"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d संसाधन क्रिया-कलाप असफ़ल"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "%s पैकेज का संसाधन हो रहा है"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "कार्यकेंद्र"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "ऑफ़िस कार्यकेन्द्र"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, fuzzy, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -393,7 +372,7 @@ msgstr ""
 "ऑफ़िस के कार्यक्रम: शब्दसंसाधक (केवर्ड, आबीवर्ड), स्प्रेडशीट (केस्प्रेड, जीन्यूमेरिक), पीडीएफ़ "
 "अवलोक्क, इत्यादि"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -402,32 +381,32 @@ msgstr ""
 "ऑफ़िस के कार्यक्रम: शब्दसंसाधक (केवर्ड, आबीवर्ड), स्प्रेडशीट (केस्प्रेड, जीन्यूमेरिक), पीडीएफ़ "
 "अवलोक्क, इत्यादि"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "खेल स्टेशन"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "मनोरंजक कार्यक्रम: आरकेड, बोर्ड, व्यूह-रचना, इत्यादि "
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "मल्टीमीडीया केन्द्र"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "ध्वनि और वीडीयो के खेलने वाले/संपादन करने वाले कार्यक्रम"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "इन्टरनेट केन्द्र"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -436,223 +415,205 @@ msgstr ""
 "विपत्र और समाचारों को पढ़ने और भेजने के लिए  (मट, टिन...) और वेब को ब्राउज़ करने के लिए "
 "औज़ारों का समूह"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "नेटवर्क कम्प्यूटर (ग्राहक)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "एस०एस०एच० को शामिल करते हुए विभिन्न प्रोटोकॉलों के लिए ग्राहक"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "आपके कम्प्यूटर की संरचना कार्य को सहज बनाने हेतु अनेक औजार"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "कन्सोल के औज़ार"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "अनेकों संपादक, कोश, संचिका औजार, टर्मिनल"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "विकास"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "सी और सी++ विकास लेखागार, कार्यक्रम और इन्क्लूड संचिकायें"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "प्रलेखन"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "लिनक्स और मुक्त सॉफ़्टवेयर पर किताबें और कैसे-करेंअस्तकें"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "एल०एस०बी०"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "लिनक्स मानकीकरण आधार ! त्रितीय पक्ष कार्यक्रमों को समर्थन"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "वेब सर्वर"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, fuzzy, c-format
 msgid "Apache"
 msgstr "रास्ता"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "ग्रुपवेयर"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "कोलाब सर्वर"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "अग्नि-भीतिका/रूटर"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "इन्टरनेट गेटवे"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/संचिका (F)/नवीन (_N)"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "पोस्टफ़िक्स विपत्र सर्वर"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "निर्देशिका जिससे पुनःस्थापन करना है"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "FTP Server"
 msgstr "एन०टी०पी० सर्वर"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "डीएनएस"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "डोमेन नाम सर्वर"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "प्रिंटर सर्वर"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "सॉबा सर्वर"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "डाटाबेस"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, fuzzy, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "पोस्टग्रीसीक्यूअल या माईसीक्यूअल डाटाबेस सर्वर"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "वेब/एफ़०टी०पी०"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "आपाचे, प्रो-एफ़०टी०पी०डी०"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "विपत्र"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "पोस्टफ़िक्स विपत्र सर्वर"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "पोस्टग्रीसीक्यूअल या माईसीक्यूअल डाटाबेस सर्वर"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "नेटवर्क कम्प्यूटर सर्वर"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "एन०एफ़०एस० सर्वर, एस०एम०बी० सर्वर, प्रोक्सी सर्वर, एस०एस०एच० सर्वर"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "सचित्र वातावरण"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "केडीई कार्यकेन्द्र"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "के डेस्कटाप वातावरण, मूलभूत सचित्र वातावरणसंलग्न औजारों के एक समूह के साथ"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "गनोम कार्यकेन्द्र"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -660,7 +621,7 @@ msgid ""
 msgstr ""
 "एक सचित्र वातावरण, उपयोगकर्ता-मित्रवत कार्यक्रमों के समुच्चय और डेस्कटाप औजारों के साथ"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "डेस्कटाप"
@@ -673,54 +634,52 @@ msgid ""
 msgstr ""
 "एक सचित्र वातावरण, उपयोगकर्ता-मित्रवत कार्यक्रमों के समुच्चय और डेस्कटाप औजारों के साथ"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "अन्य सचित्र डेस्कटाप"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, fuzzy, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "आईसीडब्लूएम, विण्डो मेकर, एनलाइटमेन्ट, एफ़वीडब्लूएम, इत्यादि"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "यूटिलिटीज़"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "एसएसएच सर्वर"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "वेबकैम"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "टर्मिनल सर्वर संरचना"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "नेटवर्क मॉनीट्रिंग"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "<b>मैनड्रिव स्टोर</b>"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "\"%s\" प्रिंटर की संरचना में असफ़ल !"
@@ -821,17 +780,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "पैकेज समूह चयन"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "अलग-अलग पैकेजों का चयन"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "कुल आकार: %d / %d एम०बी०"
@@ -948,12 +907,12 @@ msgstr "निम्नतम संसाधन"
 msgid "Software Management"
 msgstr "सॉफ़्टवेयर प्रबंधक"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "उन पैकेजों का चयन करें जिन्हें आप संसाधित करना चाहते है"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "संसाधन हो रहा है"
@@ -980,7 +939,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d पैकेज"
 msgstr[1] "%d पैकेज"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "सारांश"
@@ -990,7 +949,7 @@ msgstr "सारांश"
 msgid "Configure"
 msgstr "संरचना"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "संरचित नहीं"
@@ -1000,14 +959,14 @@ msgstr "संरचित नहीं"
 msgid "Media Selection"
 msgstr "पैकेज समूह चयन"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1016,7 +975,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1036,59 +995,49 @@ msgstr "कृपया अपने की-बोर्ड खाका का
 msgid "Here is the full list of available keyboards:"
 msgstr "यह है उपलब्ध देशों की सम्पूर्ण सूची"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "संसाधन/उन्नयन"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "यह एक संसाधन या एक उन्नयन है?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "संसाधन"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "उन्नयन %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s के लिए गूढ़लिखित कुँजी"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "संसाधन हो रहा है"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1100,17 +1049,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "आई०डी०ई०"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "आईडीई की संरचना की जा रही है"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1119,7 +1068,7 @@ msgstr ""
 "१ एमबी बूटस्ट्रैप के लिए कोई मुक्त स्थान नहीं ! संसाधन जारी रहेगा, परन्तु आपके तंत्र को बूट "
 "करने के लिए, आपको डिस्कड्रैक से एक बूटस्ट्रैप विभाजन का निर्माण करना होगा "
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, fuzzy, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1129,7 +1078,7 @@ msgstr ""
 "१ एमबी बूटस्ट्रैप के लिए कोई मुक्त स्थान नहीं ! संसाधन जारी रहेगा, परन्तु आपके तंत्र को बूट "
 "करने के लिए, आपको डिस्कड्रैक से एक बूटस्ट्रैप विभाजन का निर्माण करना होगा "
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, fuzzy, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1143,19 +1092,19 @@ msgstr ""
 "दबायें ठीक को दबायें ।\n"
 "यदि आपके पास यह नहीं है, तो इस सीडी-रॉम से संसाधन ना करने के लिए निरस्त को दबायें ।"
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "उपलब्ध पैकेजों को खोज़ा जा रहा है..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1164,52 +1113,52 @@ msgstr ""
 "कृपया चयन करें कि फ़्लापी पर पैकेजों को अधिभारण या सुरक्षित किया जायें ।\n"
 "इसका प्रारूप स्वतः_संसाधन के लिए निर्मित फ़्लापियों की भांति होता है ।"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "लोड"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "सुरक्षित"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "फ़ाइल लोड करें"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "आई०डी०ई०"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "गनोम"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "पैकेज समूह चयन"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "चयनित आकार उपलब्ध स्थान से ज्यादा है"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "संसाधन का प्रकार"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1218,82 +1167,82 @@ msgstr ""
 "आपने पैकेजों के किसी भी समूह का चयन नहीं किया है ।\n"
 "कृपया कम-से-कम जितना आप चाहते है उतने संसाधन का चयन करें:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "एक्स के साथ"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "आधार-भूत प्रलेखन के साथ (संस्तुति की जाती है !)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "वास्तविक निम्नत्तम संसाधन (विशेषकर कोई यू०आर०पी०एम०आई० नहीं)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "संसाधन का निर्माण किया जा रहा है"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "%s पैकेज का संसाधन हो रहा है"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "पैकेजों के आदेश देने में एक त्रुटि हो गयी है:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "कुछ भी हो जारी रहा जायें?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "पैकेजों के चयन को सुरक्षित करें"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "पैकेजों के संसाधन में एक त्रुटि हो गयी है:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "संसाधन-उपरान्त संरचना"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "उन्नयन"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1314,96 +1263,96 @@ msgstr ""
 "\n"
 "क्या आप इन अपडेटों को संसाधित करना चाहते है ?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s पर %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "हार्डवेयर"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "सांउड कार्ड"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "क्या आपके पास एक आई०एस०ऐ० सांउड कार्ड है?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, fuzzy, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "संसाधन के उपरान्त \"sndconfig\" को अपने साउण्ड कार्ड को संरचित करने के लिए चलायें"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "कोई साउण्ड कार्ड नहीं खोजा जा सका । संसाधन के उपरान्त \"harddrake\" को उपयोग करके देखें"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "सचित्र इन्टरफ़ेस"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "नेटवर्क और इन्टरनेट"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "प्रोक्सियां"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "संरचित"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "सुरक्षा स्तर"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "अग्नि-भीतिका"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "सक्रिय है"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "निष्क्रिय"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "आपने एक्स को संरचित नहीं किया है ।  क्या आप वास्तव में ऐसा चाहते है?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "बूटलोडर को तैयार किया जा रहा है..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, fuzzy, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1416,24 +1365,24 @@ msgstr ""
 "संसाधन जारी रहेगा, परन्तु आपको अपनी मशीन को बूट करने के लिए, \n"
 "बूट-एक्स या किसी अन्य साधन की आवश्यकता होगी"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr "इस सुरक्षा स्तर में, विण्डो विभाजन में संचिकाओं तक पहुँच सिर्फ़ प्रबंधक को हीप्राप्त है।"
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s में एक खाली फ़्लापी डालें"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "स्वतः संसाधन फ़्लापी का निर्माण किया जा रहा है..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1444,7 +1393,7 @@ msgstr ""
 "\n"
 "क्या आप वास्तव में बाहर निकलना चाहते है?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "बधाई हो"
@@ -1588,6 +1537,10 @@ msgid ""
 "Exit"
 msgstr "निकास"
 
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "संचिकायें प्रेषित की जा रही..."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/hr.po b/perl-install/install/share/po/hr.po
index e2204b887..47afcedc7 100644
--- a/perl-install/install/share/po/hr.po
+++ b/perl-install/install/share/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2005-01-04 21:25+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -16,31 +16,6 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -76,24 +51,24 @@ msgstr "Mreža"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "Kontaktiram Mandriva Linux web site za dobivanje popisa raspoloživih mirrora"
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -101,69 +76,69 @@ msgid ""
 msgstr ""
 "Kontaktiram Mandriva Linux web site za dobivanje popisa raspoloživih mirrora"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Izaberite mirror sa kojeg želite skinuti pakete"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Direktorij"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Ne mogu otvoriti %s: %s\n"
 
-#: any.pm:328
+#: any.pm:334
 #, fuzzy, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ne možete odznačiti ovaj paket budući da je već instaliran"
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Tražim pakete koje mogu nadograditi"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -175,18 +150,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Ponovno pokretanje sustava"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -195,72 +170,72 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Greška prilikom čitanja datoteke %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Slijedeći paketi će biti instalirani"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "FS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Mreža"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Molim odaberite"
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Datoteka već postoji. Da li da nju upotrijebim?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Pristup odbijen"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "dodan medij %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Ne mogu napraviti screenshotove prije particioniranja"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Screenshotovi će biti raspoloživi poslije instalaciju u %s"
@@ -271,11 +246,15 @@ msgid "Installation"
 msgstr "Instaliram"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Postavke"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -300,22 +279,22 @@ msgstr "Podižem mrežu"
 msgid "Bringing down the network"
 msgstr "Onemogućujem mrežu"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Šaljem datoteke..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "detektiran na portu %s"
@@ -357,27 +336,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Pojavila se greška"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "instalacijske intrukcije"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Instaliram paket %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Radna stanica"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Uredska radna stanica"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -386,7 +365,7 @@ msgstr ""
 "Uredski programi: tekst procesori (OpenOffice.org Writer, Kword), tablični "
 "kalkulatori (OpenOffice.org Calc, Kspread), pdf preglednici, itd"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -395,32 +374,32 @@ msgstr ""
 "Uredski programi: tekst procesori (kword, abiword), tablični kalkulatori "
 "(kspread, gnumeric), pdf preglednici, itd"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Igračka radna stanica"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Zabavni programi: arkade, ploče, strategije, itd"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedijska stanica"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Zvučni i video svirački/uređivački programi"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internet stanica"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -429,211 +408,193 @@ msgstr ""
 "Pribor alata za čitanje i slanje mail-a i news-a (pine, mutt, tin..) i za "
 "pregled Web-a"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Mrežno računalo (klijent)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klijenti za razne protokole uključujući ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Alati za lako podešavanje vašeg računala"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konzolni Alati"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Uređivači, ljuske, datotečni alati, terminali"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Razvoj"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C i C++ razvojne biblioteke, programi i uključujuće datoteke"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentacija"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Knjige i Howto-i o Linux-u i slobodnom software-u"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Posljužitelj weba"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, fuzzy, c-format
 msgid "Kolab Server"
 msgstr "NIS Poslužitelj"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Vatrozid/Ruter"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet gateway"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/Datoteka/_Nova"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix mail poslužitelj, Inn news poslužitelj"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Poslužitelj imenika"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "FTP Server"
 msgstr "NTP Poslužitelj"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS "
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Ime Domene i Mrežni Informacijki Poslužitelj (NIS)"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Ispisni poslužitelj"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "NIS Poslužitelj"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Baza podataka"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, fuzzy, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL ili MySQL poslužitelj baza"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache i Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Pošta"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix poslužitelj pošte"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL ili MySQL poslužitelj baza"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Mrežni računalni poslužitelj"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS poslužitelj, SMB poslužitelj, Proxy poslužitelj, SSH poslužitelj"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafičko Okružje"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE radna stanica"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -641,12 +602,12 @@ msgid ""
 msgstr ""
 "K Radno Okružje, osnovno grafičko okružje sa kolekcijom pripadajućih alata"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome radna stanica"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -655,7 +616,7 @@ msgstr ""
 "Grafička okružja sa korisnički prijateljskim skupom aplikacija i alatima za "
 "radno okružje"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Radna površina"
@@ -669,54 +630,52 @@ msgstr ""
 "Grafička okružja sa korisnički prijateljskim skupom aplikacija i alatima za "
 "radno okružje"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Druga grafička radna okružja"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, fuzzy, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Pomoćni programi"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "NIS Poslužitelj"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Servisi"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Prebaci postavke pisača"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Mrežne postavke"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva Linux Kontrolni Centar"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Podešavam pisač \"%s\" ..."
@@ -815,17 +774,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Odabir grupe paketa"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Individualan odabir paketa"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Ukupna veličina: %d / %d MB"
@@ -944,12 +903,12 @@ msgstr "Minimalna instalacija"
 msgid "Software Management"
 msgstr "Upravitelj Softwareom"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Odaberite pakete koje želite instalirati"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instaliram"
@@ -977,7 +936,7 @@ msgstr[0] "%d paketa"
 msgstr[1] "%d paketa"
 msgstr[2] "%d paketa"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Sažetak"
@@ -987,7 +946,7 @@ msgstr "Sažetak"
 msgid "Configure"
 msgstr "Podešavanje"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "ponovno postavi"
@@ -997,14 +956,14 @@ msgstr "ponovno postavi"
 msgid "Media Selection"
 msgstr "Odabir grupe paketa"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1013,7 +972,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1033,59 +992,49 @@ msgstr "Molim, izaberite raspored tipkovnice"
 msgid "Here is the full list of available keyboards:"
 msgstr "Ovdje je cijeli popis raspoloživih tipkovnica"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, fuzzy, c-format
 msgid "Install/Upgrade"
 msgstr "Instaliraj/Nadogradi"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, fuzzy, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Da li je ovo instalacija ili nadogradnja?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instaliraj"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, fuzzy, c-format
 msgid "Upgrade %s"
 msgstr "Dogradnja"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, fuzzy, c-format
 msgid "Encryption key for %s"
 msgstr "Enkripcijski ključ"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Instaliram"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1097,17 +1046,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Podešavam IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1117,7 +1066,7 @@ msgstr ""
 "podizanje vašeg sustava, trebati ćete napraviti bootstrap particiju u "
 "DiskDrake-u"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, fuzzy, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1128,7 +1077,7 @@ msgstr ""
 "podizanje vašeg sustava, trebati ćete napraviti bootstrap particiju u "
 "DiskDrake-u"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, fuzzy, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1143,19 +1092,19 @@ msgstr ""
 "Ukoliko ga nemate, pritisnite Odustani kako bi izbjegli instalaciju sa ovog "
 "Cd-Rom-a."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Tražim dostupne pakete"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1164,52 +1113,52 @@ msgstr ""
 "Molimo izaberite učitivanje ili spremanje izbora paketa na disketu.\n"
 "Format je isto kao auto_install napravljene diskete."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Učitaj"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Spremi"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Učitaj datoteku"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Odabir grupe paketa"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Izabrana veličina je veća nego raspoloživ prostor"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tip instalacije"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1218,82 +1167,82 @@ msgstr ""
 "Niste izabrali niti jednu grupu paketa\n"
 "Izaberite minimalnu instalaciju ako želite"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Sa X-ima"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Sa osnovnom dokumentacijom (preporučeno!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Stvarno malena instalacija (posebice bez urpmia)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Pripremam instalaciju"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Instaliram paket %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Javila se greška prilikom sortiranja paketa:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Da ipak nastavim?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Spremi odabir paketa"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Pojavila se greška kod instalacije paketa:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Postava nakon instalacije"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Nadogradnje"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, fuzzy, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1313,28 +1262,28 @@ msgstr ""
 "\n"
 "Da li želite instalirati dogradnju?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Sklopovlje"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Zvučna kartica"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Da li imate ISA zvučnu karticu?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, fuzzy, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1343,68 +1292,68 @@ msgstr ""
 "Pokrenite \"sndconfig\" poslije instalacije za podešavanje vaše zvučne "
 "kartice"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Nije pronađena zvučna kartica. Probajte \"harddrake\" poslije instalacije"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, fuzzy, c-format
 msgid "Graphical interface"
 msgstr "X kod pokretanja sustava"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Mreža i Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Profil: "
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, fuzzy, c-format
 msgid "configured"
 msgstr "ponovno postavi"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Sigurnosna Razina"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Vatrozid"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, fuzzy, c-format
 msgid "activated"
 msgstr "Aktiviraj sada"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "onemogućeno"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Pripremam bootloader"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, fuzzy, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1417,24 +1366,24 @@ msgstr ""
 "Instalacija će nastaviti, ali ćete morati\n"
 " koristiti BootX da podignete vaše računalo"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Umetnite praznu disketu u pogon %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Pravim auto instalacijsku disketu"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1445,7 +1394,7 @@ msgstr ""
 "\n"
 "Želite li zaista završiti?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Čestitamo, pobijedili ste!"
@@ -1590,6 +1539,10 @@ msgid ""
 msgstr "Izađi"
 
 #, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Šaljem datoteke..."
+
+#, fuzzy
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/hu.po b/perl-install/install/share/po/hu.po
index b99c92563..ae50d0b43 100644
--- a/perl-install/install/share/po/hu.po
+++ b/perl-install/install/share/po/hu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-2009.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-03-31 12:08+0100\n"
 "Last-Translator: Gergely Lónyai <aleph@mandriva.org>\n"
 "Language-Team: Hungarian <aleph@mandriva.org>\n"
@@ -22,31 +22,6 @@ msgstr ""
 "X-Poedit-Country: HUNGARY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Az Ön munkaasztala egy USB kulcson"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "A 100%%-ban nyílt forráskódú Mandriva Linux disztribúció"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "A Linux könnyed kipróbálása: Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Egy teljes Mandriva Linux munkaasztal, támogatással"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: disztribúciók minden igényre"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -61,7 +36,8 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
-"A telepítő a következő adathordozókat találta - ezeket fogja használni a telepítéshez: %s.\n"
+"A telepítő a következő adathordozókat találta - ezeket fogja használni a "
+"telepítéshez: %s.\n"
 "\n"
 "\n"
 "Van beállítandó kiegészítő telepítési adathordozója?"
@@ -86,114 +62,128 @@ msgstr "Hálózat (FTP)"
 msgid "Network (NFS)"
 msgstr "Hálózat (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "A tükörkiszolgáló címe?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Az URL-nek ftp:// vagy http:// előtaggal kell kezdődnie"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
-msgstr "Kapcsolódás a Mandriva Linux webkiszolgálójához; az elérhető tükörkiszolgálók listájának lekérdezése..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr ""
+"Kapcsolódás a Mandriva Linux webkiszolgálójához; az elérhető "
+"tükörkiszolgálók listájának lekérdezése..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
-msgid "Failed contacting Mandriva Linux web site to get the list of available mirrors"
-msgstr "Nem sikerült lekérdezni az elérhető tükörkiszolgálók listáját a Mandriva Linux webkiszolgálójától"
+msgid ""
+"Failed contacting Mandriva Linux web site to get the list of available "
+"mirrors"
+msgstr ""
+"Nem sikerült lekérdezni az elérhető tükörkiszolgálók listáját a Mandriva "
+"Linux webkiszolgálójától"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Válasszon tükörkiszolgálót, ahonnan letölti a csomagokat"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-beállítás"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Adja meg az NFS-adathordozó gépnevét és könyvtárát"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Gépnév hiányzik"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "A könyvtárnak \"/\" jellel kell kezdődnie"
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Az NFS-csatolás gépneve?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Könyvtár"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Kiegészítő"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
-msgid "Can't find a package list file on this mirror. Make sure the location is correct."
+msgid ""
+"Can't find a package list file on this mirror. Make sure the location is "
+"correct."
 msgstr "A tükörkiszolgálón nem található fejléclista"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "A már telepített csomagok vizsgálata..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "A frissítendő csomagok keresése..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Csomagok eltávolítása a frissítés előtt..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you choose to proceed, \n"
-"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration settings. \n"
+"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you "
+"choose to proceed, \n"
+"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration "
+"settings. \n"
 "To upgrade with KDE 3.5 and your personal settings preserved, \n"
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
-"A rendszer %s kiadásra frissítését választotta. KDE 3.5 található a jelenlegi rendszerén. \n"
-"Ez a telepítő nem tudja a KDE 3.5-öt biztonságosan frissíteni. Ha folytatja ezt a műveletet, \n"
-"akkor a KDE 4 le fogja cserélni a KDE 3.5-öt, de minden személyes KDE beállítása el fog veszni. \n"
+"A rendszer %s kiadásra frissítését választotta. KDE 3.5 található a "
+"jelenlegi rendszerén. \n"
+"Ez a telepítő nem tudja a KDE 3.5-öt biztonságosan frissíteni. Ha folytatja "
+"ezt a műveletet, \n"
+"akkor a KDE 4 le fogja cserélni a KDE 3.5-öt, de minden személyes KDE "
+"beállítása el fog veszni. \n"
 "A KDE 3.5 frissítéséhez, illetve a személyes adatainak a megőrzéséhez \n"
-"kérjük indítsa el a saját rendszerét, és használja a Mandriva frissítő alkalmazását."
+"kérjük indítsa el a saját rendszerét, és használja a Mandriva frissítő "
+"alkalmazását."
 
-#: any.pm:407
-#: steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Újraindítás"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Feldolgozva"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -206,73 +196,72 @@ msgstr ""
 "\n"
 "Szeretné eltávolítani ezeket a csomagokat?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Hiba a(z) %s fájl olvasása közben"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "A következő lemezek át lettek nevezve:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (korábbi név: %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100
-#: steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Hálózat"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Válasszon egy adatforrást"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "A fájl már létezik. Felülírja?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Hozzáférés megtagadva"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Helytelen NFS-név"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "\"%s\": hibás adatforrás"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Partícionálás előtt nem készíthetők képernyőfelvételek"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "A képernyőfelvételek a telepítés után itt lesznek elérhetők: %s"
@@ -282,13 +271,16 @@ msgstr "A képernyőfelvételek a telepítés után itt lesznek elérhetők: %s"
 msgid "Installation"
 msgstr "Telepítés"
 
-#: gtk.pm:134
-#: share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
+#: gtk.pm:134 share/meta-task/compssUsers.pl:44
 #, c-format
 msgid "Configuration"
 msgstr "Beállítás"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -313,22 +305,22 @@ msgstr "A hálózatkezelés elindítása"
 msgid "Bringing down the network"
 msgstr "A hálózatkezelés leállítása"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Kérem várjon, fájl betöltése"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "%s fájl letöltése..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Bizonyos csomagok lemezre másolása későbbi használatra"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Másolás folyamatban"
@@ -378,405 +370,345 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Hiba lépett fel:"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d telepítési művelet nem sikerült"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Sikertelen csomagtelepítések:"
 
 #: share/meta-task/compssUsers.pl:13
-#: share/meta-task/compssUsers.pl.orig:13
 #, c-format
 msgid "Workstation"
 msgstr "Munkaállomás"
 
 #: share/meta-task/compssUsers.pl:15
-#: share/meta-task/compssUsers.pl.orig:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Irodai munkaállomás"
 
 #: share/meta-task/compssUsers.pl:17
-#: share/meta-task/compssUsers.pl.orig:17
 #, c-format
-msgid "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets (OpenOffice.org Calc, Kspread), PDF viewers, etc"
-msgstr "Irodai programok: szövegszerkesztők (OpenOffice.org Writer, KWord), táblázatkezelők (OpenOffice.org Calc, KSpread), PDF-megjelenítők, ..."
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr ""
+"Irodai programok: szövegszerkesztők (OpenOffice.org Writer, KWord), "
+"táblázatkezelők (OpenOffice.org Calc, KSpread), PDF-megjelenítők, ..."
 
 #: share/meta-task/compssUsers.pl:18
-#: share/meta-task/compssUsers.pl.orig:18
 #, c-format
-msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc"
-msgstr "Irodai programok: szövegszerkesztők (KWord, AbiWord), táblázatkezelők (KSpread, Gnumeric), PDF-nézegetők, ..."
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Irodai programok: szövegszerkesztők (KWord, AbiWord), táblázatkezelők "
+"(KSpread, Gnumeric), PDF-nézegetők, ..."
 
 #: share/meta-task/compssUsers.pl:23
-#: share/meta-task/compssUsers.pl.orig:23
 #, c-format
 msgid "Game station"
 msgstr "Játékgép"
 
 #: share/meta-task/compssUsers.pl:24
-#: share/meta-task/compssUsers.pl.orig:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Játékprogramok: lövöldözős, táblás, stratégiai, ..."
 
 #: share/meta-task/compssUsers.pl:27
-#: share/meta-task/compssUsers.pl.orig:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimédiás munkaállomás"
 
 #: share/meta-task/compssUsers.pl:28
-#: share/meta-task/compssUsers.pl.orig:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Lejátszó- és szerkesztőprogramok hang- és videóanyagokhoz"
 
 #: share/meta-task/compssUsers.pl:33
-#: share/meta-task/compssUsers.pl.orig:33
 #, c-format
 msgid "Internet station"
 msgstr "Internetes munkaállomás"
 
 #: share/meta-task/compssUsers.pl:34
-#: share/meta-task/compssUsers.pl.orig:34
 #, c-format
-msgid "Set of tools to read and send mail and news (mutt, tin..) and to browse the Web"
-msgstr "Eszközök levelezéshez, hírkezeléshez (mutt, tin, ...) és a web böngészéséhez"
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Eszközök levelezéshez, hírkezeléshez (mutt, tin, ...) és a web böngészéséhez"
 
 #: share/meta-task/compssUsers.pl:39
-#: share/meta-task/compssUsers.pl.orig:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Hálózati számítógép (kliens)"
 
 #: share/meta-task/compssUsers.pl:40
-#: share/meta-task/compssUsers.pl.orig:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Kliensprogramok különféle protokollokhoz (például: ssh)"
 
 #: share/meta-task/compssUsers.pl:45
-#: share/meta-task/compssUsers.pl.orig:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Segédprogramok a számítógép beállításához"
 
 #: share/meta-task/compssUsers.pl:49
-#: share/meta-task/compssUsers.pl.orig:49
 #, c-format
 msgid "Console Tools"
 msgstr "Parancssori eszközök"
 
 #: share/meta-task/compssUsers.pl:50
-#: share/meta-task/compssUsers.pl.orig:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Szövegszerkesztők, parancsértelmezők, fájlkezelők, terminálprogramok"
 
-#: share/meta-task/compssUsers.pl:54
-#: share/meta-task/compssUsers.pl:157
+#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
 #: share/meta-task/compssUsers.pl:159
-#: share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
 #, c-format
 msgid "Development"
 msgstr "Fejlesztés"
 
-#: share/meta-task/compssUsers.pl:55
-#: share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
+#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C/C++ fejlesztőkönyvtárak, programok és include-fájlok"
 
-#: share/meta-task/compssUsers.pl:58
-#: share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentáció"
 
-#: share/meta-task/compssUsers.pl:59
-#: share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Könyvek és HOGYAN-ok a Linuxról és a szabad szoftverekről"
 
-#: share/meta-task/compssUsers.pl:63
-#: share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:64
-#: share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Külső társaságok alkalmazásainak támogatása."
 
 #: share/meta-task/compssUsers.pl:73
-#: share/meta-task/compssUsers.pl.orig:73
 #, c-format
 msgid "Web Server"
 msgstr "Webkiszolgáló"
 
 #: share/meta-task/compssUsers.pl:74
-#: share/meta-task/compssUsers.pl.orig:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
 #: share/meta-task/compssUsers.pl:77
-#: share/meta-task/compssUsers.pl.orig:77
 #, c-format
 msgid "Groupware"
 msgstr "Csoportmunka-alkalmazás"
 
 #: share/meta-task/compssUsers.pl:78
-#: share/meta-task/compssUsers.pl.orig:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab kiszolgáló"
 
-#: share/meta-task/compssUsers.pl:81
-#: share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
+#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Tűzfal/útválasztó (router)"
 
-#: share/meta-task/compssUsers.pl:82
-#: share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
+#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet átjáró"
 
 #: share/meta-task/compssUsers.pl:85
-#: share/meta-task/compssUsers.pl.orig:85
 #, c-format
 msgid "Mail/News"
 msgstr "Levelezés/hírek"
 
 #: share/meta-task/compssUsers.pl:86
-#: share/meta-task/compssUsers.pl.orig:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix email kiszolgáló, Inn hírkiszolgáló"
 
 #: share/meta-task/compssUsers.pl:89
-#: share/meta-task/compssUsers.pl.orig:89
 #, c-format
 msgid "Directory Server"
 msgstr "Címtárkiszolgáló"
 
 #: share/meta-task/compssUsers.pl:93
-#: share/meta-task/compssUsers.pl.orig:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP kiszolgáló"
 
 #: share/meta-task/compssUsers.pl:94
-#: share/meta-task/compssUsers.pl.orig:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
 #: share/meta-task/compssUsers.pl:97
-#: share/meta-task/compssUsers.pl.orig:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
 #: share/meta-task/compssUsers.pl:98
-#: share/meta-task/compssUsers.pl.orig:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "DNS és NIS kiszolgáló"
 
 #: share/meta-task/compssUsers.pl:101
-#: share/meta-task/compssUsers.pl.orig:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fájl- és nyomtatómegosztási kiszolgáló"
 
 #: share/meta-task/compssUsers.pl:102
-#: share/meta-task/compssUsers.pl.orig:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS kiszolgáló, Samba kiszolgáló"
 
-#: share/meta-task/compssUsers.pl:105
-#: share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
+#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
 #, c-format
 msgid "Database"
 msgstr "Adatbázis"
 
 #: share/meta-task/compssUsers.pl:106
-#: share/meta-task/compssUsers.pl.orig:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL és MySQL adatbázis kiszolgáló"
 
 #: share/meta-task/compssUsers.pl:110
-#: share/meta-task/compssUsers.pl.orig:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
 #: share/meta-task/compssUsers.pl:111
-#: share/meta-task/compssUsers.pl.orig:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
 #: share/meta-task/compssUsers.pl:114
-#: share/meta-task/compssUsers.pl.orig:114
 #, c-format
 msgid "Mail"
 msgstr "Levelezés"
 
 #: share/meta-task/compssUsers.pl:115
-#: share/meta-task/compssUsers.pl.orig:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix email kiszolgáló"
 
 #: share/meta-task/compssUsers.pl:119
-#: share/meta-task/compssUsers.pl.orig:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL vagy MySQL adatbázis kiszolgáló"
 
 #: share/meta-task/compssUsers.pl:126
-#: share/meta-task/compssUsers.pl.orig:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Kiszolgáló hálózati számítógépekhez"
 
 #: share/meta-task/compssUsers.pl:127
-#: share/meta-task/compssUsers.pl.orig:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS, SMB, proxy és SSH kiszolgáló"
 
 #: share/meta-task/compssUsers.pl:133
-#: share/meta-task/compssUsers.pl.orig:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafikus környezet"
 
 #: share/meta-task/compssUsers.pl:135
-#: share/meta-task/compssUsers.pl.orig:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE munkaállomás"
 
 #: share/meta-task/compssUsers.pl:136
-#: share/meta-task/compssUsers.pl.orig:136
 #, c-format
-msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"
-msgstr "A K Desktop Environment - az alapvető grafikus környezet - az ahhoz tartozó eszközökkel együtt"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"A K Desktop Environment - az alapvető grafikus környezet - az ahhoz tartozó "
+"eszközökkel együtt"
 
 #: share/meta-task/compssUsers.pl:140
-#: share/meta-task/compssUsers.pl.orig:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME munkaállomás"
 
 #: share/meta-task/compssUsers.pl:141
-#: share/meta-task/compssUsers.pl.orig:141
 #, c-format
-msgid "A graphical environment with user-friendly set of applications and desktop tools"
-msgstr "Grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
 
 #: share/meta-task/compssUsers.pl:145
-#: share/meta-task/compssUsers.pl.orig:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE munkaasztal"
 
 #: share/meta-task/compssUsers.pl:147
 #, c-format
-msgid "A lightweight & fast graphical environment with user-friendly set of applications and desktop tools"
-msgstr "Egy könnyű és gyors grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
+msgid ""
+"A lightweight & fast graphical environment with user-friendly set of "
+"applications and desktop tools"
+msgstr ""
+"Egy könnyű és gyors grafikus környezet felhasználóbarát alkalmazásokkal és "
+"segédprogramokkal"
 
 #: share/meta-task/compssUsers.pl:150
-#: share/meta-task/compssUsers.pl.orig:149
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Más grafikus környezetek"
 
 #: share/meta-task/compssUsers.pl:151
-#: share/meta-task/compssUsers.pl.orig:150
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "WindowMaker, Enlightenment, Fvwm, ..."
 
 #: share/meta-task/compssUsers.pl:174
-#: share/meta-task/compssUsers.pl.orig:173
 #, c-format
 msgid "Utilities"
 msgstr "Segédprogramok"
 
-#: share/meta-task/compssUsers.pl:176
-#: share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
+#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
 #, c-format
 msgid "SSH Server"
 msgstr "SSH kiszolgáló"
 
 #: share/meta-task/compssUsers.pl:181
-#: share/meta-task/compssUsers.pl.orig:180
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
 #: share/meta-task/compssUsers.pl:182
-#: share/meta-task/compssUsers.pl.orig:181
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin kiszolgáló távoli beállításhoz"
 
 #: share/meta-task/compssUsers.pl:186
-#: share/meta-task/compssUsers.pl.orig:185
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Hálózati programok/hálózatfigyelés"
 
 #: share/meta-task/compssUsers.pl:187
-#: share/meta-task/compssUsers.pl.orig:186
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Figyelőeszközök, folyamatszámlázás, tcpdump, nmap, ..."
 
 #: share/meta-task/compssUsers.pl:191
-#: share/meta-task/compssUsers.pl.orig:190
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva varázslók"
 
 #: share/meta-task/compssUsers.pl:192
-#: share/meta-task/compssUsers.pl.orig:191
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Varázslók a kiszolgáló beállítására"
@@ -795,7 +727,8 @@ msgstr ""
 msgid ""
 "Some important packages did not get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
+"\"\n"
 msgstr ""
 "Néhány fontos csomag telepítése nem sikerült.\n"
 "Ez azt jelenti, hogy a CD-meghajtó vagy a CD hibás.\n"
@@ -803,8 +736,7 @@ msgstr ""
 "parancs segítségével tesztelheti le:\n"
 "\"rpm -qpl media/main/*.rpm\"\n"
 
-#: steps_auto_install.pm:71
-#: steps_stdio.pm:27
+#: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
 msgid "Entering step `%s'\n"
 msgstr "A következő lépés: \"%s\"\n"
@@ -828,7 +760,8 @@ msgstr "Az Xorg kiszolgáló lassan indul. Kérem várjon..."
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandriva Linux. If that occurs, you can try a text install instead. For this,\n"
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
+"this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "A rendszer gyenge erőforrásokkal rendelkezik. Előfordulhat, hogy problémái\n"
@@ -876,21 +809,17 @@ msgstr "Így fog kinézni a '%s' munkaasztala."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Kattintson a képre, ha nagyobb méretben szeretné megtekinteni"
 
-#: steps_gtk.pm:315
-#: steps_interactive.pm:606
-#: steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Csomagcsoportok kiválasztása"
 
-#: steps_gtk.pm:336
-#: steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Csomagok egyedi kiválasztása"
 
-#: steps_gtk.pm:360
-#: steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Összméret: %d / %d MB"
@@ -960,8 +889,11 @@ msgstr "\"%s\" megtartása érdekében"
 
 #: steps_gtk.pm:452
 #, c-format
-msgid "You can not select this package as there is not enough space left to install it"
-msgstr "Nem választhatja ki ezt a csomagot, mert nincs elég hely a merevlemezen."
+msgid ""
+"You can not select this package as there is not enough space left to install "
+"it"
+msgstr ""
+"Nem választhatja ki ezt a csomagot, mert nincs elég hely a merevlemezen."
 
 #: steps_gtk.pm:455
 #, c-format
@@ -986,7 +918,8 @@ msgstr "Nem törölhető ennek a csomagnak a kijelölése, mert már telepítve
 #: steps_gtk.pm:485
 #, c-format
 msgid "You can not unselect this package. It must be upgraded"
-msgstr "Nem törölheti ennek a csomagnak a kijelölését. Ez a csomag frissítendő."
+msgstr ""
+"Nem törölheti ennek a csomagnak a kijelölését. Ez a csomag frissítendő."
 
 #: steps_gtk.pm:489
 #, c-format
@@ -1018,15 +951,12 @@ msgstr "Minimális telepítés"
 msgid "Software Management"
 msgstr "Szoftverkezelés"
 
-#: steps_gtk.pm:517
-#: steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Válassza ki a telepítendő csomagokat"
 
-#: steps_gtk.pm:534
-#: steps_interactive.pm:637
-#: steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Telepítés"
@@ -1053,9 +983,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d csomag"
 msgstr[1] "%d csomag"
 
-#: steps_gtk.pm:651
-#: steps_interactive.pm:800
-#: steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Összefoglalás"
@@ -1065,9 +993,7 @@ msgstr "Összefoglalás"
 msgid "Configure"
 msgstr "Beállítás"
 
-#: steps_gtk.pm:687
-#: steps_interactive.pm:796
-#: steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "nincs beállítva"
@@ -1077,8 +1003,7 @@ msgstr "nincs beállítva"
 msgid "Media Selection"
 msgstr "Adathordozó kiválasztása"
 
-#: steps_gtk.pm:730
-#: steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1087,18 +1012,20 @@ msgstr ""
 "A rendszer a következő telepítési adathordozókat találta.\n"
 "Ha szeretné kihagyni valamelyiket, távolítsa el annak kijelölését."
 
-#: steps_gtk.pm:746
-#: steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive before installation.\n"
-"It will then continue from the hard drive and the packages will remain available once the system is fully installed."
+"You have the option to copy the contents of the CDs onto the hard drive "
+"before installation.\n"
+"It will then continue from the hard drive and the packages will remain "
+"available once the system is fully installed."
 msgstr ""
-"Lehetősége van arra, hogy a CD-k tartalmát lemásolja a merevlemezre a telepítés előtt.\n"
-"Ez esetben a telepítés a merevlemezről folytatódik, és annak végeztével a csomagok elérhetők maradnak."
+"Lehetősége van arra, hogy a CD-k tartalmát lemásolja a merevlemezre a "
+"telepítés előtt.\n"
+"Ez esetben a telepítés a merevlemezről folytatódik, és annak végeztével a "
+"csomagok elérhetők maradnak."
 
-#: steps_gtk.pm:748
-#: steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Teljes CD-k másolása"
@@ -1118,59 +1045,49 @@ msgstr "Válasszon billentyűzetkiosztást"
 msgid "Here is the full list of available keyboards:"
 msgstr "Az elérhető billentyűzetek teljes listája:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Telepítés/frissítés"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Új telepítés vagy frissítés?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Telepítés"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Frissítés: %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "32 bites disztribúcióról 64 bitesre való frissítés nem támogatott"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "64 bites disztribúcióról 32 bitesre való frissítés nem támogatott"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Titkosítási kulcs ehhez: %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Telepítés megszakítva, a rendszer újraindul"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Új telepítés"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Előző telepítés frissítése (nem ajánlott)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1189,48 +1106,65 @@ msgstr ""
 "Figyelem: ha az \"Új telepítést\" választja, akkor ajánlott minden \n"
 "személyes adat előzetes lementése."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE beállítások"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
-msgid "No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr "Nincs elég szabad hely az 1 MB-os betöltőprogramnak. A telepítés folytatható, de a rendszer indításához létre kell hozni egy rendszerindító partíciót a DiskDrake-kel."
+msgid ""
+"No free space for 1MB bootstrap! Install will continue, but to boot your "
+"system, you'll need to create the bootstrap partition in DiskDrake"
+msgstr ""
+"Nincs elég szabad hely az 1 MB-os betöltőprogramnak. A telepítés "
+"folytatható, de a rendszer indításához létre kell hozni egy rendszerindító "
+"partíciót a DiskDrake-kel."
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
-msgid "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr "Létre kell hozni egy PPC PReP rendszerindítót. A telepítés folytatódik, de a rendszer indításához létre kell hozni a rendszerindítási partíciót a DiskDrake-kel."
+msgid ""
+"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
+"to boot your system, you'll need to create the bootstrap partition in "
+"DiskDrake"
+msgstr ""
+"Létre kell hozni egy PPC PReP rendszerindítót. A telepítés folytatódik, de a "
+"rendszer indításához létre kell hozni a rendszerindítási partíciót a "
+"DiskDrake-kel."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
-"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done.\n"
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "Cserélje ki a CD-t a meghajtóban.\n"
 "Tegye be a(z) \"%s\" feliratú lemezt, és nyomja meg az \"OK\" gombot.\n"
-"Ha nincs ilyen lemeze, akkor nyomja meg a \"Mégsem\" gombot, így erről a CD-ről nem történik telepítés."
+"Ha nincs ilyen lemeze, akkor nyomja meg a \"Mégsem\" gombot, így erről a CD-"
+"ről nem történik telepítés."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "A rendelkezésre álló csomagok keresése..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
-msgid "Your system does not have enough space left for installation or upgrade (%dMB > %dMB)"
-msgstr "A rendszerben nincs elegendő szabad hely a telepítéshez illetve frissítéshez (%d MB > %d MB)"
+msgid ""
+"Your system does not have enough space left for installation or upgrade (%"
+"dMB > %dMB)"
+msgstr ""
+"A rendszerben nincs elegendő szabad hely a telepítéshez illetve frissítéshez "
+"(%d MB > %d MB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1240,52 +1174,52 @@ msgstr ""
 "csomagkijelölést vagy a jelenlegi kijelölést szeretné elmenteni.\n"
 "A formátum ugyanaz, mint az automatikus telepítési fájloknál."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Terhelés"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Mentés"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Hibás fájl"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Munkaasztal kiválasztása"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Kiválaszthatja a munkaállomás asztalprofilját."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "A kijelölt összméret nagyobb, mint a rendelkezésre álló hely"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "A telepítés típusa"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1294,83 +1228,84 @@ msgstr ""
 "Egyetlen csomagcsoportot sem jelölt ki.\n"
 "Válassza ki, milyen fajta minimális telepítést szeretne."
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X-xel együtt"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Alapvető dokumentációval (javasolt)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Valóban minimális telepítés (urpmi sincs)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "A telepítés előkészítése"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "%s csomag telepítése"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Hiba történt a csomagok rendezésekor:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Kívánja folytatni ettől függetlenül?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Újra"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Ezen csomag kihagyása"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "A(z) \"%s\" adathordozón levő összes csomag kihagyása"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Visszalépés az adathordozó és csomagválasztáshoz"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Hiba történt a(z) %s csomag telepítésekor."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Telepítés utáni beállítások"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
-msgstr "Tegye be a frissítési modulokat tartalmazó adathordozót a(z) \"%s\" meghajtóba"
+msgstr ""
+"Tegye be a frissítési modulokat tartalmazó adathordozót a(z) \"%s\" "
+"meghajtóba"
 
-#: steps_interactive.pm:734
-#: steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Frissítések"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1389,118 +1324,131 @@ msgstr ""
 "\n"
 "Szeretné feltelepíteni a frissítéseket?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s ezen: %s"
 
-#: steps_interactive.pm:875
-#: steps_interactive.pm:882
-#: steps_interactive.pm:895
-#: steps_interactive.pm:912
-#: steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Hardver"
 
-#: steps_interactive.pm:896
-#: steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Hangkártya"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Van ISA hangkártyája?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
-msgid "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card"
-msgstr "A hangkártya beállításához futtassa az \"alsaconf\" vagy az \"sndconfig\" programot a telepítés után."
+msgid ""
+"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
+"card"
+msgstr ""
+"A hangkártya beállításához futtassa az \"alsaconf\" vagy az \"sndconfig\" "
+"programot a telepítés után."
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "A telepítő nem talált hangkártyát. Futtassa a \"harddrake\" programot a telepítés után."
+msgstr ""
+"A telepítő nem talált hangkártyát. Futtassa a \"harddrake\" programot a "
+"telepítés után."
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafikus felület"
 
-#: steps_interactive.pm:934
-#: steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Hálózat és internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxyk"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "beállítva"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Biztonsági szint"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Tűzfal"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktiválva"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "kikapcsolva"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Az X grafikus rendszert nem állította be. Biztosan megfelel így?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Rendszerbetöltő előkészítése..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Egy kis türelmét kérem..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
-msgid "You appear to have an OldWorld or Unknown machine, the yaboot bootloader will not work for you. The install will continue, but you'll need to use BootX or some other means to boot your machine. The kernel argument for the root fs is: root=%s"
-msgstr "A gép típusa feltehetően OldWorld vagy ismeretlen, ezért a Yaboot rendszerindító program nem fog működni. A telepítés folytatódik, de a gép indításához BootX-re vagy egyéb módszerre lesz szükség. A gyökér-fájlrendszer kernelparamétere: root=%s"
+msgid ""
+"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+"will not work for you. The install will continue, but you'll need to use "
+"BootX or some other means to boot your machine. The kernel argument for the "
+"root fs is: root=%s"
+msgstr ""
+"A gép típusa feltehetően OldWorld vagy ismeretlen, ezért a Yaboot "
+"rendszerindító program nem fog működni. A telepítés folytatódik, de a gép "
+"indításához BootX-re vagy egyéb módszerre lesz szükség. A gyökér-"
+"fájlrendszer kernelparamétere: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
-msgid "In this security level, access to the files in the Windows partition is restricted to the administrator."
-msgstr "Ezen a biztonsági szinten csak a rendszergazda érheti el a windowsos partíción levő fájlokat."
+msgid ""
+"In this security level, access to the files in the Windows partition is "
+"restricted to the administrator."
+msgstr ""
+"Ezen a biztonsági szinten csak a rendszergazda érheti el a windowsos "
+"partíción levő fájlokat."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Tegyen egy üres floppyt a(z) \"%s\" meghajtóba"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Automatikus telepítőfloppy készítése..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1511,7 +1459,7 @@ msgstr ""
 "\n"
 "Biztos, hogy ki akar lépni?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulálunk"
@@ -1524,8 +1472,7 @@ msgid ""
 "Language"
 msgstr "Nyelv"
 
-#: steps_list.pm:16
-#: steps_list.pm:23
+#: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
 msgstr "Lokalizáció"
@@ -1544,16 +1491,14 @@ msgid ""
 "Mouse"
 msgstr "Egér"
 
-#: steps_list.pm:19
-#: steps_list.pm:20
+#: steps_list.pm:19 steps_list.pm:20
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
 msgstr "Merevlemez keresése"
 
-#: steps_list.pm:21
-#: steps_list.pm:22
+#: steps_list.pm:21 steps_list.pm:22
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
@@ -1581,8 +1526,7 @@ msgid ""
 "Partitioning"
 msgstr "Partícionálás"
 
-#: steps_list.pm:27
-#: steps_list.pm:28
+#: steps_list.pm:27 steps_list.pm:28
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
@@ -1610,24 +1554,21 @@ msgid ""
 "Users"
 msgstr "Felhasználók"
 
-#: steps_list.pm:36
-#: steps_list.pm:37
+#: steps_list.pm:36 steps_list.pm:37
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Networking"
 msgstr "Hálózat"
 
-#: steps_list.pm:38
-#: steps_list.pm:39
+#: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Bootloader"
 msgstr "Rendszerbetöltő"
 
-#: steps_list.pm:40
-#: steps_list.pm:41
+#: steps_list.pm:40 steps_list.pm:41
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
@@ -1641,8 +1582,7 @@ msgid ""
 "Summary"
 msgstr "Összefoglalás"
 
-#: steps_list.pm:44
-#: steps_list.pm:45
+#: steps_list.pm:44 steps_list.pm:45
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
@@ -1663,6 +1603,30 @@ msgid ""
 "Exit"
 msgstr "Kilépés"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Az Ön munkaasztala egy USB kulcson"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "A 100%%-ban nyílt forráskódú Mandriva Linux disztribúció"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "A Linux könnyed kipróbálása: Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Egy teljes Mandriva Linux munkaasztal, támogatással"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: disztribúciók minden igényre"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "%s fájl letöltése..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "32 bites disztribúcióról 64 bitesre való frissítés nem támogatott"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "64 bites disztribúcióról 32 bitesre való frissítés nem támogatott"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
@@ -1686,16 +1650,21 @@ msgstr "Kilépés"
 #~ "\n"
 #~ "\n"
 #~ "Biztosan telepíteni szeretné a kiszolgálóprogramo(ka)t?\n"
+
 #~ msgid "IceWm Desktop"
 #~ msgstr "IceWm-munkaasztal"
+
 #~ msgid "Contacting the mirror to get the list of available packages..."
 #~ msgstr ""
 #~ "Kapcsolatfelvétel a tükörkiszolgálóval; az elérhető csomagok listájának "
 #~ "letöltése..."
+
 #~ msgid "Unable to contact mirror %s"
 #~ msgstr "Nem sikerült kapcsolódni ehhez a tükörkiszolgálóhoz: %s"
+
 #~ msgid "Generate auto install floppy"
 #~ msgstr "Automatikus telepítőfloppy készítése"
+
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
 #~ "in that case it will take over the hard drive!!\n"
@@ -1709,14 +1678,19 @@ msgstr "Kilépés"
 #~ "a rendszert.\n"
 #~ "\n"
 #~ "Lehetőség van a telepítés újrajátszására is.\n"
+
 #~ msgid "Replay"
 #~ msgstr "Újrajátszás"
+
 #~ msgid "Automated"
 #~ msgstr "Automatikus"
+
 #~ msgid "Save packages selection"
 #~ msgstr "Csomagösszeállítás mentése"
+
 #~ msgid "Do you want to use aboot?"
 #~ msgstr "Szeretné az aboot-ot használni?"
+
 #~ msgid ""
 #~ "Error installing aboot, \n"
 #~ "try to force installation even if that destroys the first partition?"
@@ -1724,4 +1698,3 @@ msgstr "Kilépés"
 #~ "Hiba az aboot telepítésekor.\n"
 #~ "Próbáljam újra a telepítést akkor is, ha ez esetleg tönkreteszi az első\n"
 #~ "partíciót?"
-
diff --git a/perl-install/install/share/po/id.po b/perl-install/install/share/po/id.po
index 4def4ffce..1eaccf092 100644
--- a/perl-install/install/share/po/id.po
+++ b/perl-install/install/share/po/id.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2007-10-27 18:51+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -26,31 +26,6 @@ msgstr ""
 "X-Generator: KBabel 0.6\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -90,23 +65,23 @@ msgstr "Jaringan (FTP)"
 msgid "Network (NFS)"
 msgstr "Jaringan (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL dari mirror?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL harus diawali dengan ftp:// atau http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "Menghubungi situs Mandriva Linux untuk mengambil daftar mirror..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -115,47 +90,47 @@ msgstr ""
 "Gagal menghubungi situs Mandriva Linux untuk mengambil daftar mirror yang "
 "tersedia"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Pilih mirror tempat Anda ingin mengambil paket"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "Setup NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Harap masukkan nama host dan direktori dari media NFS Anda"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Nama host tidak ada"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Direktori harus dimulai dengan \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Nama host dari mount NFS ?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Direktori"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Tambahan"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -164,22 +139,22 @@ msgstr ""
 "Tidak dapat menemukan file daftar paket pada mirror ini. Pastikan lokasinya "
 "benar."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Mencari paket yang sudah terinstall..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Mencari paket untuk diupgrade..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Menghapus paket-paket sebelum upgrade..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -191,18 +166,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Boot Ulang"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -215,72 +190,72 @@ msgstr ""
 "\n"
 "Apakah Anda ingin menghapus paket tersebut?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Kesalahan membaca file %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Disk berikut telah diubah namanya:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (sebelumnya bernama %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "HFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Jaringan"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Silahkan pilih media"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "File sudah ada. Timpa file ini ?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Izin ditolak"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nama NFS yang salah"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Media rusak %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Tidak bisa membuat screenshot sebelum buat partisi"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Screenshot akan tersedia setelah installasi pada %s"
@@ -291,11 +266,15 @@ msgid "Installation"
 msgstr "Installasi"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurasi"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -320,22 +299,22 @@ msgstr "Mengaktifkan jaringan"
 msgid "Bringing down the network"
 msgstr "Menonaktifkan jaringan"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Mendownload file %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Menyalin beberapa paket pada disk untuk kebutuhan di masa depan"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Penyalinan sedang berjalan"
@@ -379,27 +358,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Terjadi kesalahan"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "transaksi installasi %d gagal"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Menginstall paket %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Workstation"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Workstation Kantor"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -408,7 +387,7 @@ msgstr ""
 "Program office: pengolah kata (OpenOffice.org Writer, Kword), spreadsheet "
 "(OpenOffice.org Calc, Kspread), viewer pdf, dll"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -417,32 +396,32 @@ msgstr ""
 "Program office: pengolah kata (kword, abiword), spreadsheet (kspread, "
 "gnumeric), viewer pdf, dll"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Komputer Game"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Program hiburan: arcade, papan, strategi, dll"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Komputer Multimedia"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Program untuk memainkan/mengedit suara dan video"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Komputer Internet"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -451,211 +430,193 @@ msgstr ""
 "Kumpulan aplikasi untuk membaca dan mengirimkan email dan berita (pine, "
 "mutt, tin..) dan untuk menjelajah Web"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Komputer Jaringan (klien)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klien untuk berbagai protokol, termasuk ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Aplikasi untuk mempermudah konfigurasi komputer Anda."
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Aplikasi Konsol"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editor, shell, aplikasi file, terminal"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Pengembangan"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Pustaka, program, dan file include untuk pengembangan C dan C++"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentasi"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Buku dan Howto untuk Linux dan Free Software"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Dukungan aplikasi pihak ketiga"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Server Web"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Server Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Firewall/Router"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Gateway Internet"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Mail/Berita"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Server mail Postfix, server berita Inn"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Server Direktori"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Nama Domain dan Network Information Server"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Server Sharing File dan Printer"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Server NFS, server Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Basis Data"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Server Basis Data PostgreSQL dan MySQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Mail"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Server mail Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "Server basis data PostgreSQL atau MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Komputer Server Jaringan"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "server NFS, SMB, Proxy, dan SSH"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Mode Grafis"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "Workstation KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -664,12 +625,12 @@ msgstr ""
 "K Desktop Environment, lingkungan grafis dasar dengan kumpulan aplikasi yang "
 "menyertainya"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Workstation Gnome"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -678,7 +639,7 @@ msgstr ""
 "Lingkungan grafis dengan kumpulan aplikasi dan aplikasi desktop yang ramah "
 "pengguna"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Desktop IceWm"
@@ -692,54 +653,52 @@ msgstr ""
 "Lingkungan grafis dengan kumpulan aplikasi dan aplikasi desktop yang ramah "
 "pengguna"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Desktop Grafis lainnya"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, dsb"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Utilitas"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "Server SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Server Konfigurasi Remote Webmin"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Utilitas Jaringan/Pengawasan"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Aplikasi pengawasan, akuntasi proses, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Wizard Mandriva"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Wizard untuk mengkonfigurasi server"
@@ -839,17 +798,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pilihan Grup Paket"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Pilih paket individu"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Ukuran total: %d / %d MB"
@@ -967,12 +926,12 @@ msgstr "Installasi minimal"
 msgid "Software Management"
 msgstr "Manajemen Perangkat Lunak"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Pilih paket yang akan diinstal"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Menginstall"
@@ -998,7 +957,7 @@ msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d paket"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Ringkasan"
@@ -1008,7 +967,7 @@ msgstr "Ringkasan"
 msgid "Configure"
 msgstr "Konfigurasikan"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "tidak dikonfigurasikan"
@@ -1018,7 +977,7 @@ msgstr "tidak dikonfigurasikan"
 msgid "Media Selection"
 msgstr "Pilihan Grup Paket"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1027,7 +986,7 @@ msgstr ""
 "Media installasi berikut ditemukan. Jika Anda ingin\n"
 "melewati beberapa, Anda bisa tidak memilihnya sekarang."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1039,7 +998,7 @@ msgstr ""
 "Proses akan dilanjutkan dari hard disk dan paket akantetap tersedia setelah "
 "sistem terinstall."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Salin seluruh CD"
@@ -1059,59 +1018,49 @@ msgstr "Pilih layout keyboard Anda"
 msgid "Here is the full list of available keyboards:"
 msgstr "Berikut daftar keyboard yang tersedia"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instal/Upgrade"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Installasi atau upgrade?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Install"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Upgrade %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Upgrade dari distribusi 32bit ke 64bit tidak didukung"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Upgrade dari distribusi 64bit ke 32bit tidak didukung"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Kunci enkripsi untuk %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Installasi"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1123,17 +1072,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Mengkonfigurasi IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1142,7 +1091,7 @@ msgstr ""
 "Tidak ada ruang 1MB untuk bootstrap! Installasi akan dilanjutkan, tetapi "
 "untuk boot sistem, Anda perlu membuat partisi bootstrap pada DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1152,7 +1101,7 @@ msgstr ""
 "Anda harus membuat PPC PReP Boot bootstrap! Installasi akan dilanjutkan, "
 "tetapi untuk boot sistem, Anda perlu membuat partisi bootstrap pada DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1165,12 +1114,12 @@ msgstr ""
 "Masukkan Cd-Rom berlabel \"%s\" pada drive dan tekan Ok. Jika Anda tidak \n"
 "punya, tekan Batal untuk menghindari installasi dari Cd-Rom ini."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Mencari paket yang tersedia..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1179,7 +1128,7 @@ msgstr ""
 "Sistem Anda tidak memilih ruang kosong yang cukup untuk installasi atau "
 "upgrade (%dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1188,53 +1137,53 @@ msgstr ""
 "Pilih muat atau simpan pilihan paket.\n"
 "Formatnya sama dengan file auto_install."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Beban"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Simpan"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "File rusak"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Pilihan Grup Paket"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, fuzzy, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 "Anda bisa memilih profil desktop workstation Anda: KDE, GNOME atau Kustom"
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Ukuran terpilih melebihi ruang yang ada"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipe installasi"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1243,82 +1192,82 @@ msgstr ""
 "Anda belum memilih grup paket.\n"
 "Pilih installasi minimal yang Anda inginkan:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Dengan X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Dengan dokumentasi dasar (disarankan!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Installasi minimal sesungguhnya (khususnya tanpa urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Mempersiapkan installasi"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Menginstall paket %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Terdapat kesalahan pengurutan paket:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Lanjutkan?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Ulang kembali"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Lewati paket ini"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Lewati semua paket-paket dari media \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Kembali pada media dan pemilihan paket"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Terdapat kesalahan penginstallan paket %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Konfigurasi pasca installasi"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Harap pastikan media Update Modul pada drive %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Update"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1338,28 +1287,28 @@ msgstr ""
 "\n"
 "Apakah Anda ingin menginstall update?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s pada %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Perangkat Keras"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Kartu suara"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Apakah Anda memiliki kartu suara ISA?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1368,68 +1317,68 @@ msgstr ""
 "Jalankan \"sndconfig\" atau \"sndconfig\" setelah installasi untuk "
 "mengkonfigurasi kartu suara Anda"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Tidak ada kartu suara yang terdeteksi. Coba \"harddrake\" setelah installasi"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Antarmuka grafis"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Jaringan & Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxy "
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "terkonfigurasi"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Tingkat Keamanan"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "telah diaktifkan"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "telah dinonaktifkan"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Anda belum mengkonfigurasi X. Apakah Anda yakin?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Mempersiapkan bootloader..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1442,7 +1391,7 @@ msgstr ""
 "BootX atau cara lain untuk boot komputer Anda. Argumen kernel untuk fs root "
 "adalah: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1451,17 +1400,17 @@ msgstr ""
 "Pada tingkat keamanan ini, akses pada file pada partisi Windows dibatasi "
 "hanya pada administrator."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Masukkan disket kosong pada drive %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Membuat disket installasi otomatis..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1472,7 +1421,7 @@ msgstr ""
 "\n"
 "Apakah Anda ingin keluar sekarang?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Selamat"
@@ -1616,6 +1565,15 @@ msgid ""
 "Exit"
 msgstr "Keluar"
 
+#~ msgid "Downloading file %s..."
+#~ msgstr "Mendownload file %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Upgrade dari distribusi 32bit ke 64bit tidak didukung"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Upgrade dari distribusi 64bit ke 32bit tidak didukung"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/is.po b/perl-install/install/share/po/is.po
index efe8374cd..39a18bf4b 100644
--- a/perl-install/install/share/po/is.po
+++ b/perl-install/install/share/po/is.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-03-30 14:04+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -20,31 +20,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Vinnustöðin þín á USB lykli"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Mandriva uppsetningin með 100%% frjálsum, opnum hugbúnaði"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Kannaðu Linux með Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Full Mandriva Linux vinnustöð, með þjónustu"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: dreifingar við allra hæfi"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -84,24 +59,25 @@ msgstr "Net (FTP)"
 msgid "Network (NFS)"
 msgstr "Net (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Vefslóð að spegli?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Slóð verður að byrja á ftp:// eða http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "Hef samband við Mandriva Linux vefinn til að sækja lista yfir fáanlega "
 "spegla..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -110,47 +86,47 @@ msgstr ""
 "Mistókst að tengjast við Mandriva Linux vefinn til að sækja lista yfir "
 "fáanlega spegla"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Veldu spegilvélina þaðan sem á að sækja pakkanna"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS uppsetning"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Sláðu inn vélarnafn og möppu sem inniheldur NFS miðil"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Vélarnafn vantar"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Möppunafn verður að byrja á \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Vélarnafn á NFS tengipunkti?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Mappa"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Aukalegt"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -159,22 +135,22 @@ msgstr ""
 "Finn ekki pakkalista-skrá á þessum spegli. Athugaðu hvort staðsetningin sé "
 "rétt."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Athuga þegar uppsetta pakka..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Leita að pökkum til að uppfæra..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Fjarlægi pakka áður en uppfærsla hefst..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -195,18 +171,18 @@ msgstr ""
 "endurræstu\n"
 "þá tölvuna þína og notaðu Mandriva bakka-uppfærsluforritið."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Endurræsa"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Halda áfram"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -219,72 +195,72 @@ msgstr ""
 "\n"
 "Viltu í alvöru fjarlægja þessa pakka?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Villa við lestur úr skránni %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Eftirfarandi diskar voru endurnefndir:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (áður nefnt %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Net"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Veldu miðil"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Skráin er þegar til. Skrifa yfir hana?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Aðgangi hafnað"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Rangt NFS nafn"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Gallaður miðill %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Get ekki tekið skjámyndir fyrr en disksneiðar hafa verið skilgreindar"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjámyndir verða tiltækar eftir uppsetningu í %s"
@@ -295,11 +271,15 @@ msgid "Installation"
 msgstr "Set inn"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Stillingar"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -325,22 +305,22 @@ msgstr "Keyri upp netið"
 msgid "Bringing down the network"
 msgstr "Keyri niður netið"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Bíðið, sæki skrá"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Sæki skrá %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Afrita nokkra pakka á diska til notkunar síðar"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Afritun í gangi"
@@ -384,27 +364,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Villa kom upp:"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d Innsetningarfærslur brugðust"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Innsetning pakka tókst ekki:"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Vinnustöð"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Skrifstofu-vinnustöð"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -413,7 +393,7 @@ msgstr ""
 "Skrifstofu forrit: ritvinnsla (OpenOffice.org Writer, Kword), töflureiknar "
 "(OpenOffice.org Calc, Kspread) pdf skoðarar, o.s.frv"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -422,32 +402,32 @@ msgstr ""
 "Skrifstofu forrit: ritvinnsla (kword, abiword), töflureiknar (kspread, "
 "gnumeric) pdf skoðarar, o.s.frv"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Leikja-(vinnu)stöð"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Leikjaforrit, skotleikir, borðleikir, herkænskuleikir og fleira"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Margmiðlunar-vinnustöð"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Spila og breyta hljóðskrám og kvikmyndum"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internet-vinnustöð"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -456,230 +436,212 @@ msgstr ""
 "Tól og tæki til að lesa og senda póst, fréttir (mutt,tin...) og til að "
 "flakka á vefnum"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Netbiðlarar"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Biðlarar fyrir ýmsar samskiptareglur þ.m.t ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Tæki til að auðvelda uppsetningu tölvunnar"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Skjától"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Ritlar, skeljar, skráatól, skjáhermar"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Forritun"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C og C++ undirforritasöfn, forrit og lýsingaskrár"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Handbækur"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Bækur og leiðbeiningar um Linux og frjálsan hugbúnað"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Stuðningur fyrir forrit þriðja aðila"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Vefmiðlari"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Hópvinnuforrit"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Miðlari"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Eldveggur/beinir"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet netgátt"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Póstur/Fréttir"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix póstþjónusta, Inn fréttaþjónusta"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Upplýsingaveita"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP Miðlari"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Nafnaþjónustur og net-upplýsingaveitur"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Skráa og prentmiðlari"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS miðlari, Samba miðlari"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Gagnagrunnar"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL og MySQL gagnagrunns-miðlarar"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Vefur/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Póstur"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix póstþjónusta"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL eða MySQL gagnagrunns-miðlarar"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Netþjónustur"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-þjónusta, SMB-þjónusta, Staðgengils-þjónusta, ssh-þjónusta"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Myndrænt umhverfi"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE Vinnustöð"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE (K Desktop Environment). Gluggastjóri með safni hjálparforrita"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome vinnustöð"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Gluggastjóri með notendavænum forritum og skjáborðs-tólum"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE Skjáborð"
@@ -689,56 +651,55 @@ msgstr "LXDE Skjáborð"
 msgid ""
 "A lightweight & fast graphical environment with user-friendly set of "
 "applications and desktop tools"
-msgstr "Létt og hratt gluggaumhverfi með notendavænum forritum og skjáborðs-tólum"
+msgstr ""
+"Létt og hratt gluggaumhverfi með notendavænum forritum og skjáborðs-tólum"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Aðrir gluggastjórar"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, o.s.frv"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Tól"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Miðlari"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin, stillingar á fjartengdri tölvu um vef"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Netforrit/Neteftirlit"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Eftirlitstól, vinna með notendur, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva Ráðgjafar"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Ráðgjafar til að stilla miðlara"
@@ -839,17 +800,17 @@ msgstr "Hér er forsýn af '%s' skjáborðinu."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Smelltu á myndir til að sjá stærri forsýn"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Val á pakkahóp"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Val á einstökum pökkum"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Heildarstærð: %d / %d MB"
@@ -966,12 +927,12 @@ msgstr "Lágmarks uppsetning"
 msgid "Software Management"
 msgstr "Hugbúnaðarumsýsla"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Veldu pakkana sem þú vilt setja inn"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Set inn"
@@ -998,7 +959,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pakki"
 msgstr[1] "%d pakkar"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Yfirlit"
@@ -1008,7 +969,7 @@ msgstr "Yfirlit"
 msgid "Configure"
 msgstr "Stilla"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "ekki stillt"
@@ -1018,7 +979,7 @@ msgstr "ekki stillt"
 msgid "Media Selection"
 msgstr "Val á miðlum"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1027,7 +988,7 @@ msgstr ""
 "Eftirfarandi uppsetningar-miðlar hafa fundist.\n"
 "Ef þú vilt sleppa einhverjum af þeim, þá getur þú af-valið þá núna."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1040,7 +1001,7 @@ msgstr ""
 "Síðan mun uppsetning halda áfram frá disknum og pakkarnir verða til staðar "
 "þegar kerfið er að fullu uppsett."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Afrita alla geisladiska"
@@ -1060,59 +1021,49 @@ msgstr "Veldu lyklaborðs-uppsetningu"
 msgid "Here is the full list of available keyboards:"
 msgstr "Hér er tæmandi listi af tiltækum lyklaborðum:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Innsetning/Uppfærsla"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Er þetta innsetning eða uppfærsla?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Innsetning"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Uppfæra %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Ekki er stutt við uppfærslu frá 32-bita í 64-bita dreifingu"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Ekki er stutt við uppfærslu frá 64-bita í 32-bita dreifingu"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Dulritunar-lykill fyrir %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Hætta við innsetningu, endurræsa kerfi"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Ný Uppsetning"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Uppfæra fyrri uppsetningu (ekki mælt með)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1131,17 +1082,17 @@ msgstr ""
 "Aðvörun : þú ættir að afrita öll persónuleg gögn áður en þú velur \"Ný "
 "Uppsetning\"."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Uppsetning IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1150,7 +1101,7 @@ msgstr ""
 "Ekki pláss fyrir 1MB ræsigeira! Uppsetning mun halda áfram, en til að ræsa "
 "kerfið þitt verður þú að búa til ræsi-disksneið með DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1160,7 +1111,7 @@ msgstr ""
 "Þú þarft að búa til PPC PReP for-ræsingu! Uppsetningin mun halda áfram, en "
 "til að ræsa kerfið, þarft þú að búa til ræsi-disksneið með DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1174,12 +1125,12 @@ msgstr ""
 "Ef þú hefur ekki diskinn, ýttu þá að \"Hætta við\" til að sleppa uppsetningu "
 "frá þessum diski."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Leita að tiltækum pökkum..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1188,7 +1139,7 @@ msgstr ""
 "Það er ekki nóg laust pláss fyrir innsetningu eða uppfærslu á kerfinu þínu (%"
 "dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1197,52 +1148,52 @@ msgstr ""
 "Veldu hvort eigi að sækja eða vista pakkaval.\n"
 "Sniðið er það sama og á auto_install skrám."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Sækja"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Vista"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Gölluð skrá"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Val á Skjáborði"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Þú getur valið vinnustöðvar-umhverfi (skjáborð)."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valin stærð er stærri en tiltækt pláss"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tegund uppsetningar"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1251,82 +1202,82 @@ msgstr ""
 "Þú hefur ekki valið neina pakkahópa.\n"
 "Veldu lágmarksuppsetningu sem þú vilt:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Með X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Með grunn-handbókum (mælt með!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Alger lágmarksuppsetning (ekkert urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Undirbý innsetningu"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Set inn pakka %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Það kom upp villa við að raða pökkum:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Viltu samt halda áfram?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Reyna aftur"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Sleppa þessum pakka"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Sleppa ölum pökkum af miðli \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Fara til baka í val á miðlum og pökkum"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Það kom upp villa við innsetningu pakka %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Lokastillingar"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Staðfestu að Uppfærslu-miðill sé í drifi %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Uppfærslur"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1346,28 +1297,28 @@ msgstr ""
 "\n"
 "Viltu sækja uppfærslurnar?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s á %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Vélbúnaður"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Hljóðkort"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Er kannski ISA hljóðkort í vélinni?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1376,67 +1327,68 @@ msgstr ""
 "Keyrðu \"alsaconf\" eða \"sndconfig\" eftir uppsetningu til að stilla "
 "hljóðkortið þitt"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "Ekkert hljóðkort fannst. Reyndu að keyra \"harddrake\" eftir uppsetningu"
+msgstr ""
+"Ekkert hljóðkort fannst. Reyndu að keyra \"harddrake\" eftir uppsetningu"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Myndrænt viðmót"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Staðarnet og Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Sel"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "stillt"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Öryggisþrep"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Eldveggur"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "virkt"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "óvirkt"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Þú hefur ekki sett upp X, ertu viss um að þú viljir þetta?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Set upp ræsistjórann..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Verið þolinmóð þetta getur tekið nokkra stund..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1449,7 +1401,7 @@ msgstr ""
 "verður að nota BootX eða aðrar leiðir til að ræsa vélina. kjarna-viðfangið "
 "fyrir rótarsneiðina er: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1458,17 +1410,17 @@ msgstr ""
 "Í þessu öryggisþrepi er aðgangur að Windows disksneiðum takmarkaður við "
 "kerfisstjóra."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Settu tóman diskling í drif %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Bý til diskling fyrir sjálfvirka uppsetningu..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1479,7 +1431,7 @@ msgstr ""
 "\n"
 "Viltu virkilega hætta núna?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Til hamingju"
@@ -1623,3 +1575,26 @@ msgid ""
 "Exit"
 msgstr "Hætta"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Vinnustöðin þín á USB lykli"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Mandriva uppsetningin með 100%% frjálsum, opnum hugbúnaði"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Kannaðu Linux með Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Full Mandriva Linux vinnustöð, með þjónustu"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: dreifingar við allra hæfi"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Sæki skrá %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Ekki er stutt við uppfærslu frá 32-bita í 64-bita dreifingu"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Ekki er stutt við uppfærslu frá 64-bita í 32-bita dreifingu"
diff --git a/perl-install/install/share/po/it.po b/perl-install/install/share/po/it.po
index ed844bb88..cceb19f9e 100644
--- a/perl-install/install/share/po/it.po
+++ b/perl-install/install/share/po/it.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-03-30 21:26+0200\n"
 "Last-Translator: Andrea Celli <andrea.celli@libero.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -22,31 +22,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Il tuo desktop su una chiave USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Mandriva Linux, la distribuzione 100%% open source"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Prova Linux senza fatica con Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Un sistema Mandriva Linux completo, con supporto"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: le distribuzioni per le esigenze di ognuno"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -87,24 +62,25 @@ msgstr "Rete (FTP)"
 msgid "Network (NFS)"
 msgstr "Rete (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL del mirror?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "L'URL deve iniziare con ftp:// o http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "Connessione al sito Mandriva Linux per ricevere l'elenco dei mirror "
 "disponibili..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -113,47 +89,48 @@ msgstr ""
 "Impossibile collegarsi al sito Mandriva Linux per ricevere l'elenco dei "
 "mirror disponibili"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Scegli un mirror da cui prelevare i pacchetti"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "Configurazione NFS"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
-msgstr "Immetti il nome dell'host e della directory che userai come supporto NFS"
+msgstr ""
+"Immetti il nome dell'host e della directory che userai come supporto NFS"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Manca il nome dell'host"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Una directory deve iniziare con \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Nome dell'host da montare con NFS?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Directory"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Aggiuntivo"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -162,22 +139,22 @@ msgstr ""
 "Impossibile trovare su questo mirror il file con l'elenco dei pacchetti. "
 "Assicurati che l'indirizzo sia esatto."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ricerca dei pacchetti già installati..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Ricerca dei pacchetti da aggiornare..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Rimozione dei pacchetti prima di aggiornare..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -198,18 +175,18 @@ msgstr ""
 "riavvia il sistema e aggiornalo usando l'applet Mandriva per gli "
 "aggiornamenti."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Riavvia"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Procedi"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -223,72 +200,72 @@ msgstr ""
 "\n"
 "Vuoi davvero rimuoverli?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Errore nel leggere il file %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Questi dischi hanno cambiato nome:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (che prima si chiamava %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Rete"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Scegli un supporto"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Il file esiste già. Lo sovrascrivo?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nome NFS non valido"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Supporto non valido %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Impossibile fare degli screenshot prima del partizionamento"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Gli screenshot saranno disponibili in %s dopo l'installazione."
@@ -299,11 +276,15 @@ msgid "Installation"
 msgstr "Installazione"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Configurazione"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -328,22 +309,22 @@ msgstr "Attivazione della rete..."
 msgid "Bringing down the network"
 msgstr "Disattivazione della rete..."
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Per favore attendere, recupero file in corso"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Scaricamento del file %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Copia di alcuni pacchetti sui dischi per un'utilizzazione futura"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Copia in corso"
@@ -387,27 +368,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Si è verificato un errore:"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transazioni dell'installazione fallite"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installazione dei pacchetti non riuscita:"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Workstation"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Postazione per lavoro da ufficio"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -416,7 +397,7 @@ msgstr ""
 "Programmi da ufficio: word-processor (OpenOffice.org Writer, Kword), fogli "
 "elettronici (OpenOffice.org Calc, Kspread), visualizzatori PDF, ecc."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -425,32 +406,32 @@ msgstr ""
 "Programmi da ufficio: word-processor (kword, abiword), fogli elettronici "
 "(kspread, gnumeric), visualizzatori pdf, ecc."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Computer per giocare"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programmi di svago: arcade, da tavolo, di strategia, ecc."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Computer multimediale"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programmi di riproduzione/modifica audio e video"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Postazione Internet"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -459,211 +440,193 @@ msgstr ""
 "Gruppo di programmi per leggere e inviare posta e news (mutt, tin...) e per "
 "navigare il Web"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Computer in rete (client)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Client per vari protocolli, incluso ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Strumenti per semplificare la configurazione del computer"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Programmi da riga di comando"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editor, shell, gestione file, terminali"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Sviluppo"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Librerie di sviluppo, programmi e file \"include\" per C e C++"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Documentazione"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Libri e Howto su Linux e sul Software Libero"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Supporto per applicazioni di terze parti"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Server web"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Server Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Firewall/Router"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Gateway per Internet"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Mail/News"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Server di posta Postfix, server di news Inn"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Directory Server"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Server per Domain Name e Network Information"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Server per la condivisione di file e stampanti"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Server NFS, server Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Server di database PostgreSQL e MySQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache e Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Posta"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Server di posta Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "Server di database PostgreSQL o MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Server di rete"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Server NFS, server SMB, server proxy, server SSH"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ambiente grafico"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "Workstation grafica con KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -672,12 +635,12 @@ msgstr ""
 "Il K Desktop Environment, l'ambiente grafico di base integrato da una ricca "
 "collezione di strumenti"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Workstation grafica con GNOME"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -686,7 +649,7 @@ msgstr ""
 "Un ambiente grafico con un gruppo di applicazioni user-friendly e strumenti "
 "per il desktop"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Desktop LXDE"
@@ -700,54 +663,52 @@ msgstr ""
 "Un ambiente grafico leggero e veloce dotato di applicazioni user-friendly e "
 "di strumenti per il desktop"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Altri desktop grafici"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, ecc."
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Utilità"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "Server SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Server Webmin per la configurazione remota"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Utilità/Monitoraggio della rete"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Strumenti di monitoraggio, accounting dei processi, tcpdump, nmap,..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Procedure guidate Mandriva"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Procedure guidate per la configurazione del server"
@@ -846,17 +807,17 @@ msgstr "Ecco l'anteprima del desktop '%s'."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Clicca sulle immagini per ottenere un'anteprima più grande"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Selezione per gruppi di pacchetti"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Selezione individuale dei pacchetti"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Dimensione totale: %d / %d MB"
@@ -975,12 +936,12 @@ msgstr "Installazione minimale"
 msgid "Software Management"
 msgstr "Gestione software"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Scegli i pacchetti che vuoi installare"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installazione"
@@ -1007,7 +968,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pacchetto"
 msgstr[1] "%d pacchetti"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Riepilogo"
@@ -1017,7 +978,7 @@ msgstr "Riepilogo"
 msgid "Configure"
 msgstr "Configura"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "non configurata"
@@ -1027,7 +988,7 @@ msgstr "non configurata"
 msgid "Media Selection"
 msgstr "Selezione delle fonti d'installazione"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1036,7 +997,7 @@ msgstr ""
 "Sono state trovate queste fonti d'installazione.\n"
 "Se vuoi ignorarne qualcuna, la puoi deselezionare ora."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1049,7 +1010,7 @@ msgstr ""
 "L'installazione continuerà dal disco fisso e i pacchetti resteranno "
 "disponibili anche quando il sistema sarà installato."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copia tutti i CD"
@@ -1069,63 +1030,49 @@ msgstr "Scegli la mappa della tastiera"
 msgid "Here is the full list of available keyboards:"
 msgstr "Ecco la lista completa delle tastiere disponibili:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installazione/Aggiornamento"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "È un'installazione o un aggiornamento?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installazione"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Aggiornamento di %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"Non è supportato il passaggio da una versione a 32bit ad una più nuova a "
-"64bit"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"Non è supportato il passaggio da una versione a 64bit ad una più nuova a "
-"32bit"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Chiave di codifica per %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Cancella l'installazione, riavvia il sistema"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Nuova Installazione"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Aggiorna l'installazione precedente (Non raccomandato)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1144,17 +1091,17 @@ msgstr ""
 "Attenzione : è consigliato un backup di tutti i dati personali \n"
 "prima di scegliere \"Nuova Installazione\"."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Sto configurando IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1163,7 +1110,7 @@ msgstr ""
 "Non c'è spazio libero per un bootstrap di 1MB! L'installazione continua, ma "
 "per avviare il sistema dovrai creare la partizione di bootstrap con DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1174,7 +1121,7 @@ msgstr ""
 "ma non potrai avviare il sistema, se prima non avrai creato la partizione di "
 "avvio con DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1187,12 +1134,12 @@ msgstr ""
 "pronto.\n"
 "Se non lo hai, premi Annulla per saltare l'installazione da quel Cd-Rom."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Sto cercando i pacchetti disponibili..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1201,7 +1148,7 @@ msgstr ""
 "Sul sistema non è rimasto sufficiente spazio libero per l'installazione o "
 "l'aggiornamento (%dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1210,52 +1157,52 @@ msgstr ""
 "Scegli se caricare o salvare la selezione di pacchetti.\n"
 "Il formato è lo stesso dei file generati con auto_install."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Carica"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Salva"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "File non valido"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Selezione Desktop"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Puoi scegliere il profilo della tua workstation per il desktop"
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Lo spazio richiesto è maggiore di quello disponibile"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipo di installazione"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1264,82 +1211,83 @@ msgstr ""
 "Nessun gruppo di pacchetti risulta selezionato .\n"
 "Scegli il tipo di installazione minima desiderato:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Con X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Con la documentazione essenziale (raccomandata!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Installazione veramente minimale (in particolare niente urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Sto preparando l'installazione"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Installazione del pacchetto %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "C'è un errore nell'ordinamento dei pacchetti:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Vado avanti comunque?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Riprova"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Salta questo pacchetto"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Salta tutti i pacchetti provenienti da \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Torna alla scelta dei pacchetti e delle fonti"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "C'è stato un errore nell'installazione del pacchetto %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configurazione post installazione"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
-msgstr "Assicurati che gli \"Update Modules\" siano leggibili dal dispositivo %s"
+msgstr ""
+"Assicurati che gli \"Update Modules\" siano leggibili dal dispositivo %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Aggiornamenti"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1360,28 +1308,28 @@ msgstr ""
 "\n"
 "Vuoi installare gli aggiornamenti?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s in %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Scheda audio"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Hai una scheda audio ISA?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1390,67 +1338,68 @@ msgstr ""
 "Lancia \"alsaconf\" o \"sndconfig\" dopo l'installazione per configurare la "
 "scheda audio"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "Nessuna scheda audio rilevata. Prova con \"harddrake\" dopo l'installazione."
+msgstr ""
+"Nessuna scheda audio rilevata. Prova con \"harddrake\" dopo l'installazione."
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfaccia grafica"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Rete e Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxy"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "configurato"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Livello di sicurezza"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "attivato"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "disabilitato"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Non hai configurato X. Sei sicuro di non volerlo fare?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Preparazione del bootloader..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "sii paziente, potrebbe servire un po' di tempo..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1463,7 +1412,7 @@ msgstr ""
 "BootX o qualche altro metodo per avviare il tuo computer. L'argomento da "
 "passare al kernel per il fs radice è: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1472,17 +1421,17 @@ msgstr ""
 "A questo livello di sicurezza, l'accesso ai file delle partizioni Windows è "
 "riservato all'amministratore."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Inserisci un floppy vuoto nell'unità %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Sto creando il floppy di installazione automatica..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1493,7 +1442,7 @@ msgstr ""
 "\n"
 "Vuoi veramente interrompere adesso?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Congratulazioni"
@@ -1637,3 +1586,30 @@ msgid ""
 "Exit"
 msgstr "Esci"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Il tuo desktop su una chiave USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Mandriva Linux, la distribuzione 100%% open source"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Prova Linux senza fatica con Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Un sistema Mandriva Linux completo, con supporto"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: le distribuzioni per le esigenze di ognuno"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Scaricamento del file %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Non è supportato il passaggio da una versione a 32bit ad una più nuova a "
+#~ "64bit"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Non è supportato il passaggio da una versione a 64bit ad una più nuova a "
+#~ "32bit"
diff --git a/perl-install/install/share/po/ja.po b/perl-install/install/share/po/ja.po
index 5fae3cdaf..eecd5376a 100644
--- a/perl-install/install/share/po/ja.po
+++ b/perl-install/install/share/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-03-22 21:11+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -19,31 +19,6 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -83,23 +58,23 @@ msgstr "ネットワーク (FTP)"
 msgid "Network (NFS)"
 msgstr "ネットワーク (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "ミラーの URL"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL は ftp:// または http:// で始まらなければなりません"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "Mandriva Linux のサイトに接続してミラーのリストを取得しています..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -108,47 +83,47 @@ msgstr ""
 "Mandriva Linux ウェブサイトへの接続に失敗したため、利用可能なミラーのリストを"
 "取得できませんでした"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "パッケージを取得するミラーを選択"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS の設定"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "NFS メディアのホスト名とディレクトリを入力してください"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "ホスト名がありません"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "ディレクトリは \"/\" で始まらなければなりません"
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS マウントのホスト名"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "ディレクトリ"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "補助"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -157,22 +132,22 @@ msgstr ""
 "パッケージリストのファイルが見つかりません。ミラーの場所が正しいか確認してく"
 "ださい。"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "インストール済みパッケージを探しています..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "更新するパッケージを探しています..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "アップグレードする前にパッケージを削除しています..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -184,18 +159,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "再起動"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "続行"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -208,72 +183,72 @@ msgstr ""
 "\n"
 "これらのパッケージを削除してよろしいですか？\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "ファイル %s を読み込み中にエラー"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "次のディスクの名前は変更されました:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (変更前の名前は %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "ネットワーク"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "メディアを選んでください"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "ファイルが既に存在します。上書きしますか？"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "アクセス許可がありません"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "不正な NFS 名"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "不正なメディア %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "パーティション設定が終わるまでスクリーンショットは撮れません"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
@@ -285,11 +260,15 @@ msgid "Installation"
 msgstr "インストール"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "設定"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -314,22 +293,22 @@ msgstr "ネットワークを確立"
 msgid "Bringing down the network"
 msgstr "ネットワークを切断"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "ファイルを取得しています。お待ちください。"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "ファイル %s をダウンロード中..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "後で利用するためにパッケージをディスクにコピー"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "コピーしています"
@@ -373,27 +352,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "エラーが発生しました"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 件のインストールが失敗しました"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "パッケージ %s をインストール"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "ワークステーション"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "オフィスワークステーション"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -402,7 +381,7 @@ msgstr ""
 "オフィスソフト: ワープロ (OpenOffice.org Writer, Kword), 表計算 (OpenOffice."
 "org Calc, Kspread), PDF ビューアなど"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -411,262 +390,244 @@ msgstr ""
 "オフィスソフト: ワープロ (kword,abiword), 表計算 (kspread,gnumeric), PDF "
 "ビューアなど"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "ゲームステーション"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "ゲームプログラム: アーケードゲーム, ボードゲーム, 戦略ゲームなど"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "マルチメディアステーション"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "サウンドと動画の再生/編集ソフト"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "インターネットステーション"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "メールとニュースの送受信用ツール (mutt,tin..) とウェブブラウズ用ツール"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "ネットワーク (クライアント)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "ssh などの各種プロトコル用クライアント"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "コンピュータの設定を簡単にするツール"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "コンソールツール"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "エディタ, シェル, ファイル関連ツール, ターミナル"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "開発用"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C/C++ の開発ライブラリ, プログラム, include ファイル"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "ドキュメント"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linux/フリーソフト関連の文書とHowto"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base, サードパーティのアプリケーションをサポート"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Web サーバ"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "グループウェア"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolabサーバ"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "ファイアウォール/ルータ"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "インターネットゲートウェイ"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "メール/ニュース"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix メールサーバ, Inn ニュースサーバ"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "ディレクトリサーバ"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP サーバ"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "ドメイン名/ネットワークインフォメーションサーバ"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "ファイル/プリンタ共有サーバ"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS サーバ/Samba サーバ"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "データベース"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL/MySQLデータベースサーバ"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "メール"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix メールサーバ"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL/MySQL データベースサーバ"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "ネットワークコンピュータサーバ"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS サーバ, SMB サーバ, プロキシサーバ, SSH サーバ"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "グラフィカル環境"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE ワークステーション"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE - さまざまなツールを含む定番グラフィカル環境"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME ワークステーション"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE デスクトップ"
@@ -678,54 +639,52 @@ msgid ""
 "applications and desktop tools"
 msgstr "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "その他のグラフィカルデスクトップ"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm など"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "ユーティリティ"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH サーバ"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin リモート設定サーバ"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "ネットワークユーティリティ/モニタリング"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "モニタリングツール, プロセス管理, tcpdump, nmap..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva ウィザード"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "サーバ設定ウィザード"
@@ -824,19 +783,19 @@ msgstr "%s デスクトップのプレビューです。"
 msgid "Click on images in order to see a bigger preview"
 msgstr "画像をクリックすると大きなプレビューが表示されます"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "パッケージグループを選択"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "パッケージを個別に選択"
 
 # Changed "total size" to "total", due to problem of available
 # space on screen.
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "合計: %d/%d MB"
@@ -954,12 +913,12 @@ msgstr "最小インストール"
 msgid "Software Management"
 msgstr "ソフトウェアの管理"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "インストールするパッケージを選んでください"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "インストール中"
@@ -985,7 +944,7 @@ msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d 個のパッケージ"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "まとめ"
@@ -995,7 +954,7 @@ msgstr "まとめ"
 msgid "Configure"
 msgstr "設定"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "設定されていません"
@@ -1005,7 +964,7 @@ msgstr "設定されていません"
 msgid "Media Selection"
 msgstr "メディアの選択"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1014,7 +973,7 @@ msgstr ""
 "次のインストールメディアを検出しました。\n"
 "使用しないものがあればここで選択を解除してください。"
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1026,7 +985,7 @@ msgstr ""
 "そうするとインストーラはハードドライブからインストールを続けます。コピーされ"
 "たパッケージはインストール完了後も利用できます。"
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "CD 全体をコピー"
@@ -1046,63 +1005,49 @@ msgstr "キーボードの配列を選んでください"
 msgid "Here is the full list of available keyboards:"
 msgstr "利用可能なすべてのキーボードのリスト:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "インストール/更新"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "インストールか更新を選んでください"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "インストール"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s を更新"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"32bit から 64bit ディストリビューションへのアップグレードはサポートされていま"
-"せん"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"64bit から 32bit ディストリビューションへのアップグレードはサポートされていま"
-"せん"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s の暗号鍵"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "インストールを中止し、システムを再起動"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "新しくインストール"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "既存のシステムをアップグレード (非推奨)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1121,17 +1066,17 @@ msgstr ""
 "警告: 「新しくインストール」を選択する前に、必ず個人データの\n"
 "バックアップを作成してください。"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE を設定"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1141,7 +1086,7 @@ msgstr ""
 "ステムを起動するには、DiskDrake でブートストラップパーティションを作成する必"
 "要があります。"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1152,7 +1097,7 @@ msgstr ""
 "システムを起動するには、DiskDrake でブートストラップパーティションを作成する"
 "必要があります。"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1164,12 +1109,12 @@ msgstr ""
 "\"%s\" という CD-ROM をドライブに入れて「OK」を押してください。\n"
 "お持ちでない場合は「キャンセル」を押してください。"
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "利用可能なパッケージを探しています..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1178,7 +1123,7 @@ msgstr ""
 "あなたのシステムにはインストールまたはアップグレードに必要な空き容量がありま"
 "せん (%dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1187,52 +1132,52 @@ msgstr ""
 "パッケージの選択を読み込むか保存するかを選んでください。\n"
 "形式は auto_install で生成されたファイルと同じです。"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "読み込む"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "保存する"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "不正なファイル"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "デスクトップの選択"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "ワークステーションのデスクトッププロファイルを選択."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "指定されたサイズが空き容量を超えています"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "インストールの種類"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1241,82 +1186,82 @@ msgstr ""
 "パッケージグループが選択されていません。\n"
 "インストールする最低限のものを選んでください:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X を使う"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "基本的なドキュメントを入れる (推奨)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "最小限のインストール (urpmi も含まれません)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "インストールの準備"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "パッケージ %s をインストール"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "パッケージを並べ替え中にエラーが発生:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "続けますか？"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "再試行"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "このパッケージを飛ばす"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "メディア %s のすべてのパッケージを飛ばす"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "メディアとパッケージの選択に戻る"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "パッケージ %s のインストール中にエラーが発生しました。"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "インストール後の設定"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "更新モジュールメディアがドライブ %s に入っていることを確認してください"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "更新"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1336,28 +1281,28 @@ msgstr ""
 "\n"
 "更新されたパッケージをインストールしますか？"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s の %1$s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "ハードウェア"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "サウンドカード"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "ISA サウンドカードをお使いですか？"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1366,69 +1311,69 @@ msgstr ""
 "インストール後に alsaconf か sndconfig を実行してサウンドカードを設定してくだ"
 "さい。"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "サウンドカードが見つかりません。インストール後に harddrake で再度設定を試みて"
 "ください。"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "グラフィカルインターフェース"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "ネットワークとインターネット"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "プロキシ"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "設定済み"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "セキュリティレベル"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "ファイアウォール"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "有効"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "無効"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "X が設定されていません。本当によろしいですか？"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "ブートローダを準備中..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "しばらく時間がかかります。お待ちください。"
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1440,7 +1385,7 @@ msgstr ""
 "は yaboot は動きません。インストールを続けますが、マシンを起動するには、"
 "BootX もしくは他の方法が必要です。'root fs' のカーネル引数は 'root=%s' です。"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1449,17 +1394,17 @@ msgstr ""
 "このセキュリティレベルでは、Windows パーティションのファイルへのアクセスが管"
 "理者のみに限定されます。"
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "空のフロッピーをドライブ %s に入れてください"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "インストール自動化フロッピーを作成中..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1470,7 +1415,7 @@ msgstr ""
 "\n"
 "本当に終了しますか？"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "おめでとうございます"
@@ -1614,6 +1559,19 @@ msgid ""
 "Exit"
 msgstr "終了"
 
+#~ msgid "Downloading file %s..."
+#~ msgstr "ファイル %s をダウンロード中..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "32bit から 64bit ディストリビューションへのアップグレードはサポートされて"
+#~ "いません"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "64bit から 32bit ディストリビューションへのアップグレードはサポートされて"
+#~ "いません"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/ko.po b/perl-install/install/share/po/ko.po
index 3155f4f57..2bd5235d2 100644
--- a/perl-install/install/share/po/ko.po
+++ b/perl-install/install/share/po/ko.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ko(metanav)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2007-06-18 14:54+0900\n"
 "Last-Translator: meta <hbahn@metq.com>\n"
 "Language-Team: ahb hong-bae <ko@li.org>\n"
@@ -20,31 +20,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -84,23 +59,23 @@ msgstr "망(FTP)"
 msgid "Network (NFS)"
 msgstr "망(NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "미러사이트의 (URL)주소를 적어주십시오."
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL 주소는 ftp:// 또는 http:// 로 시작되어야 합니다."
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "유효한 미러 목록을 받기 위해 Mandriva Linux 홈페이지에 접속 중..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -108,47 +83,47 @@ msgid ""
 msgstr ""
 "Mandriva Linux 홈페이지에 접속하여 미러사이트목록을 받는 데 실패했습니다."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "패키지를 받을 미러 사이트를 선택하시오."
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "망 파일 시스템 (NFS) 구성"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "NFS 매체의 호스트 이름과 디렉토리를 입력해 주십시요."
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "호스트 이름을 찾을 수 없습니다"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "디렉토리는 \"/\"로 시작되어야 합니다."
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "망 파일 시스템(NFS)의 호스트 이름을 설치합니까?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "디렉토리"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "추가"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -156,22 +131,22 @@ msgid ""
 msgstr ""
 "미러 사이트에서 패키지 리스트를 찾을 수 없습니다. 이 위치에 만드시겠습니까?"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "이미 설치된 패키지 찾는 중..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "업그레이드할 패키지를 검색중..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "업그레이드된 패키지를 제거하는 중..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -183,18 +158,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "다시 시작"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -207,72 +182,72 @@ msgstr ""
 "\n"
 "정말 이 패키지들을 제거 하시겠습니까?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s 파일을 읽는중 오류가 발생했습니다."
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "다음 디스크이름이 변경되었습니다. :"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (이전 이름은 %s였음.)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP(하이퍼텍스트 전송 규약)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP(파일 전송규약)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS(망 파일 시스템)"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "망"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "매체를 선택하시오"
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "파일이 이미 존재합니다. 덮어쓸까요?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "권한이 없습니다."
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "부정확한 NFS 이름입니다"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "알 수 없는 미디어 %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "파티션을 나누기 전에는 스크린샷을 만들 수 없습니다."
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "스크린샷은 설치 이후에 %s에 위치 할 것입니다."
@@ -283,11 +258,15 @@ msgid "Installation"
 msgstr "설치중"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "설정"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -312,22 +291,22 @@ msgstr "망 활성화 중..."
 msgid "Bringing down the network"
 msgstr "망 해제 중..."
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "파일 전송 중 ..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "추후 사용하기 위해 디스크에 패키지 복사중... "
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "검색 진행 중"
@@ -369,27 +348,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "오류 발생"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "설치 실패."
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "%s 패키지 설치중"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "워크스테이션"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "오피스 워크스테이션"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -398,7 +377,7 @@ msgstr ""
 "오피스 프로그램들: 워드프로세서 (OpenOffice.org Writer, Kword), 스프레드쉬트 "
 "(OpenOffice.org Calc, Kspread), PDF 뷰어, 등등"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -407,262 +386,244 @@ msgstr ""
 "오피스 프로그램들: 워드프로세서 (kword, abiword), 스프레드쉬트 (kspread,"
 "gnumeric), pdf 뷰어, 등등"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "게임 스테이션"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "간단한 게임모음: 아케이드, 보드, 전략 등등"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "멀티미디어 스테이션"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "사운드 및 비디오 연주/편집 프로그램"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "인터넷 스테이션"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "메일/뉴스를 읽고 보내며 (mutt, tin..) 웹검색을 하기 위한 도구모음"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "망 컴퓨터 (클라이언트)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "SSH를 포함한 여러 프로토콜의 클라이언트"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "쉽게 컴퓨터 설정을 하기 위한 도구"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "콘솔 도구"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "에디터, 쉘, 파일도구, 터미널"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "개발"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C/C++ 개발 라이브러리, 프로그램 및 헤더파일"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "문서"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "리눅스 및 자유 소프트웨어에 대한 서적과 Howto문서"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "리눅스 기본 규격(Linux Standard Base)"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "리눅스 기본 규격. 외부 애플리케이션 지원"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "웹 서버"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "아파치"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "그룹웨어"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab 서버"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "방화벽/라우터"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "인터넷 게이트웨이"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/파일(F)/새로 만들기(_N)"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "포스트픽스 메일 서버"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "디렉토리 서버"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP 서버"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "도메인 이름 서버/망 정보 서버"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "도메인 이름 및 망 정보 서버"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "프린터 서버"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS 서비스, 삼바 서비스"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "데이터베이스"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, fuzzy, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL 또는 MySQL 데이터베이스 서버"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "웹/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "아파치와 프로FTPD"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "메일"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "포스트픽스 메일 서버"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL 또는 MySQL 데이터베이스 서버"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "망 컴퓨터 서버"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS 서버, 삼바 서버, 프록시 서버, SSH 서버"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "그래픽 환경"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "K 데스크탑 환경 기반 워크스테이션"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "K Desktop 환경, 여러가지 도구를 수반한 기본 그래픽 환경"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME 워크스테이션"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "사용자 친화적 응용 프로그램들과 데스크탑 도구들을 가진 그래픽 환경"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "IceWm 데스크탑"
@@ -674,54 +635,52 @@ msgid ""
 "applications and desktop tools"
 msgstr "사용자 친화적 응용 프로그램들과 데스크탑 도구들을 가진 그래픽 환경"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "기타 그래픽 데스크탑"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, fuzzy, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, 윈도우 메이커, 인라이튼먼트, Fvwm, 등등"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "유틸리티"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH 서비스"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "웹민 서비스"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin 원격 설정 서버"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "망 유틸리티들/감시"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "감시 도구, 프로세스 관리, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "맨드리바 제어 센터"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "서버 설정 도우미"
@@ -822,17 +781,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "패키지 그룹 선택"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "개별 팩키지 선택"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "전체 크기: %d / %d MB"
@@ -949,12 +908,12 @@ msgstr "최소 설치"
 msgid "Software Management"
 msgstr "소프트웨어 관리"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "설치할 패키지를 선택하시오."
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "설치중"
@@ -981,7 +940,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d 패키지"
 msgstr[1] "%d 패키지"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "요약설명"
@@ -991,7 +950,7 @@ msgstr "요약설명"
 msgid "Configure"
 msgstr "설정"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "설정되지 않음"
@@ -1001,7 +960,7 @@ msgstr "설정되지 않음"
 msgid "Media Selection"
 msgstr "패키지 그룹 선택"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1010,7 +969,7 @@ msgstr ""
 "다음 설치 매체를 찾았습니다.\n"
 "설치 하지 않으려면 설치해제하십시오."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1022,7 +981,7 @@ msgstr ""
 "그러면 하드 드라이브에 설치한 후에도 패키지는 시스템에 남아서 재설치가 가능합"
 "니다."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "전체 CD 복사"
@@ -1042,59 +1001,49 @@ msgstr "키보드 구성을 선택하시오"
 msgid "Here is the full list of available keyboards:"
 msgstr "지원되는 키보드 목록입니다."
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "설치/업그레이드"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "설치합니까 아니면 업그레이드 합니까?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr ""
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "업그레이드 %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, fuzzy, c-format
 msgid "Encryption key for %s"
 msgstr "암호화 키"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "설치중"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1106,17 +1055,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE 설정중"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1126,7 +1075,7 @@ msgstr ""
 "설치는 계속할 수 있지만, 시스템을 부팅하기 위해서는 DiskDrake에서 부트스트랩 "
 "파티션을 만들어야 합니다."
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1137,7 +1086,7 @@ msgstr ""
 "설치는 계속할 수 있지만, 시스템을 부팅하기 위해서는 DiskDrake에서 부트스트랩 "
 "파티션을 만들어야 합니다."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1150,12 +1099,12 @@ msgstr ""
 "「%s」라고 쓰여진 CDROM을 드라이브에 넣은 후, 「확인」을 눌러 주세요.\n"
 "만약 CDROM을 가지고 있지 않다면, 「취소」를 눌러 추가 설치를 취소하세요."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "유효한 패키지를 찾고 있습니다."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1164,7 +1113,7 @@ msgstr ""
 "현재 시스템에는 설치 또는 업그레이드 할만한 충분한 공간이 \n"
 "남아있지 않습니다.(%dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1173,52 +1122,52 @@ msgstr ""
 "패키지 선택목록을 불러올지 혹은 저장할지를 선택하세요.\n"
 "형식(포맷)은 자동설치 생성 파일과 동일합니다."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "불러오기"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "저장"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "손상된 파일 혹은 없는 파일입니다."
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "그놈"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "패키지 그룹 선택"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "선택된 용량이 사용할 수 있는 공간보다 큽니다."
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "설치 타입"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1227,82 +1176,82 @@ msgstr ""
 "어떤 패키지 그룹도 선택되지 않았습니다.\n"
 "패키지 최소설치 이상을  선택하십시오."
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X 포함"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "기본 문서 포함(추천!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "최소 설치(특히 urpmi사용안함)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "설치 준비중입니다"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "%s 패키지 설치중"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "패키지를 정렬하는 중 오류발생:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "계속 진행합니까?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "재시도"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "이 패키지는 설치하지 않고 지나가기"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "\"%s\"에서 모든 패키지를 설치하지 않음"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "미디어나 패키지 선택목록으로 돌아가기"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "다음 패키지 설치중 오류 발생: %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "설치 후 환경설정"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "업데이트 모듈 매체가 %s 드라이브에 있도록 하십시오."
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "업데이트"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1320,28 +1269,28 @@ msgstr ""
 "이 패키지들을 다운로드 받으려면 인터넷이 연결되어 있어야 합니다.\n"
 "업데이트를 설치 하시겠습니까?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s (%s 컴퓨터)"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "하드웨어"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "사운드 카드"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "ISA 사운드 카드가 있습니까?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1350,69 +1299,69 @@ msgstr ""
 "사운드 카드를 설정하려면 설치 후에\n"
 "「alsaconf」 또는 「sndconfig」명령을 실행해주십시요."
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "사운드 카드가 발견되지 않았습니다.\n"
 "설치 후에「harddrake」명령을 실행해주십시요."
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "시작시 바로 X-Window 실행"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "망과 인터넷"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "프록시"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "재설정되었습니다."
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "보안 등급"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "방화벽"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "활성화"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "금지"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "X 설정이 되지 않았습니다. 설정하시겠습니까?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "부트 로더 준비중"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1426,7 +1375,7 @@ msgstr ""
 "BootX나 또는 몇몇 방법을 써야 될수도 있습니다. \n"
 "root fs를 위한 kernel argument : root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1435,17 +1384,17 @@ msgstr ""
 "이 보안 등급에서는 윈도우즈 파티션에서의 파일 접근이 관리자에 의해 제한 됩니"
 "다."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s 드라이브에 빈 플로피 디스크를 넣으세요"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "자동 설치 플로피 디스크 생성 중"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1456,7 +1405,7 @@ msgstr ""
 "\n"
 "정말 지금 종료 하시겠습니까?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "축하합니다."
@@ -1600,6 +1549,10 @@ msgid ""
 "Exit"
 msgstr "종료"
 
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "파일 전송 중 ..."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/ky.po b/perl-install/install/share/po/ky.po
index ac6863cf1..033a50f77 100644
--- a/perl-install/install/share/po/ky.po
+++ b/perl-install/install/share/po/ky.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-03-06 22:10+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kyrgyz\n"
@@ -18,31 +18,6 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Сиздин иш столуңуз USBде"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% ачык кодду Mandriva Linux дистрибутиви"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Linux'ту Mandriva One менен аралап үйрөнүү"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Толук Mandriva Linux иш столу жардам менен"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: ар бирдин керектеген дистрибутив"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -82,113 +57,128 @@ msgstr "Желе  (FTP)"
 msgid "Network (NFS)"
 msgstr "Тармак (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Күзгүсүнүн URL'и?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL ftp:// же http:// менен башталышы керек"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "Бар болгон күзгүлөр тизмесин Mandriva Linux веб сайтындан алынууда..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
-msgid "Failed contacting Mandriva Linux web site to get the list of available mirrors"
-msgstr "Бар болгон күзгүлөр тизмесин Mandriva Linux веб сайтындан алынууда ийгиликсиз айяктады..."
+msgid ""
+"Failed contacting Mandriva Linux web site to get the list of available "
+"mirrors"
+msgstr ""
+"Бар болгон күзгүлөр тизмесин Mandriva Linux веб сайтындан алынууда "
+"ийгиликсиз айяктады..."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Пакеттерди алуучу күзгүнү тандаңыз"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS орнотуу"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "NFS топтомунун компьютер атын жана директориясын кириңиз"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Түйюндүн аты көрсөтүлгөн жок"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Директория \"/\" белги менен башталышы керек"
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS туташуунун түйюн аты ?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Каталог"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Кошумча"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
-msgid "Can't find a package list file on this mirror. Make sure the location is correct."
-msgstr "Бул күзгүдө пакеттердин тизмеси атбылган жок. Жайгашуусунун тууралыгын текшериңиз."
+msgid ""
+"Can't find a package list file on this mirror. Make sure the location is "
+"correct."
+msgstr ""
+"Бул күзгүдө пакеттердин тизмеси атбылган жок. Жайгашуусунун тууралыгын "
+"текшериңиз."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Орнотулган пакеттер изделип жатат..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Жаңыланычуу пакеттер изделип жатат..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Жаңылоодон мурда пакеттер өчүрүлүп жатат..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you choose to proceed, \n"
-"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration settings. \n"
+"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you "
+"choose to proceed, \n"
+"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration "
+"settings. \n"
 "To upgrade with KDE 3.5 and your personal settings preserved, \n"
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 "%s чейин системанын жаңылоосун чечтиңиз. KDE 3.5 системаңызда табылды.\n"
-"Буд орноткуч жаңылоодо KDE 3.5'ти сакатабайт. Эгерде орнотууну уланта берсеңиз, \n"
-"KDE 4 KDE 3'тү алмаштырып салат жана жеке ырастоолоруңуз менен KDE ырастоолору \n"
-"жоголуп кетет. KDE 3.5'тен жаңылоо жана жеке ырастоолорду сактап калуу үчүн, \n"
-"системаны кайрадан жүктөп жана Mandriva жаңылоо аплети менен жаңыланым көрүңүз."
+"Буд орноткуч жаңылоодо KDE 3.5'ти сакатабайт. Эгерде орнотууну уланта "
+"берсеңиз, \n"
+"KDE 4 KDE 3'тү алмаштырып салат жана жеке ырастоолоруңуз менен KDE "
+"ырастоолору \n"
+"жоголуп кетет. KDE 3.5'тен жаңылоо жана жеке ырастоолорду сактап калуу "
+"үчүн, \n"
+"системаны кайрадан жүктөп жана Mandriva жаңылоо аплети менен жаңыланым "
+"көрүңүз."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Кайра жүктөө"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Аткарылды"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -202,72 +192,72 @@ msgstr ""
 "\n"
 "Бул пакеттердин алынып ташталуусун каалайсызбы?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s файлын окуудагы ката"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Төмөнкү диск(тер)дин аты өзгөртүлдү:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (мурунку аты %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Желе"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Алып жүрүүчүнү тандаңыз"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Файл алдагачан бар. Үстүнө кайра жазылсынбы?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Кирүү укугу четке кагылды"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Жаман NFS аты"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "%s жараксыз алып жүрүүчү"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Бөлүмдөрдү жаратууга чейин скриншотторду түзүүгө болбойт"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Орнотуудан кийин скриншоттор %s ичинде болот"
@@ -277,13 +267,16 @@ msgstr "Орнотуудан кийин скриншоттор %s ичинде �
 msgid "Installation"
 msgstr "Орнотуу"
 
-#: gtk.pm:134
-#: share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
+#: gtk.pm:134 share/meta-task/compssUsers.pl:44
 #, c-format
 msgid "Configuration"
 msgstr "Конфигурациялоо"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -295,7 +288,8 @@ msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"Компьютериңизде кээбир жабдыктар иштөө үчүн эркин эмес драйверлерди талап кылат.\n"
+"Компьютериңизде кээбир жабдыктар иштөө үчүн эркин эмес драйверлерди талап "
+"кылат.\n"
 "Алар жөнүндө маалыматты көрсөтүлгөн жерден табып аласыз: %s"
 
 #: interactive.pm:22
@@ -308,22 +302,22 @@ msgstr "Тармак көтөрүлүүдө"
 msgid "Bringing down the network"
 msgstr "Тармак өчүрүлүүдө"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Күтө туруңуз, файл жүктөлүп жатат"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "%s файлы жүктөөлүп жатат..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Кээбир пакеттерди келечекте колдонуу үчүн дискке көчүрүп жатат"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Көчүрүү жүрүүдө"
@@ -367,289 +361,294 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Жаңылыштык орун алды"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d орнотуу транзакциялары ишке ашпады"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "%s пакети орнотуулууда"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Иш станциясы"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Офис станциясы"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
-msgid "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets (OpenOffice.org Calc, Kspread), PDF viewers, etc"
-msgstr "Офис программалары: текст процессорлору (OpenOffice.org Writer, Kword), электрондук таблицалар  (OpenOffice.org Calc, Kspread), pdf файлдарын көрүү программалары, ж.б."
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr ""
+"Офис программалары: текст процессорлору (OpenOffice.org Writer, Kword), "
+"электрондук таблицалар  (OpenOffice.org Calc, Kspread), pdf файлдарын көрүү "
+"программалары, ж.б."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
-msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc"
-msgstr "Офис программалары: текст процессорлору (kword, abiword), электрондук таблицалар  (kspread, gnumeric), pdf файлдарын көрүү программалары, ж.б."
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Офис программалары: текст процессорлору (kword, abiword), электрондук "
+"таблицалар  (kspread, gnumeric), pdf файлдарын көрүү программалары, ж.б."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Оюн станциясы"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Оюн-зоок программалары: аркада оюндары, тактай оюндары, стратегия оюндары, ж.б."
+msgstr ""
+"Оюн-зоок программалары: аркада оюндары, тактай оюндары, стратегия оюндары, ж."
+"б."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Мультимедиа станциясы"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Үн жана видео ойнотуу/терүү программалары"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Интернет станциясы"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
-msgid "Set of tools to read and send mail and news (mutt, tin..) and to browse the Web"
-msgstr "Почтаны жана жаңылыктарды (mutt, tin..) окууга жана жөнөтүүгө, жана вебде иштөөгө арналган куралдар тобу"
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Почтаны жана жаңылыктарды (mutt, tin..) окууга жана жөнөтүүгө, жана вебде "
+"иштөөгө арналган куралдар тобу"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Тармак компьютери (клиент)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Ар түрдүү протоколдор клиенттери, ssh да кошулган"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Компьютериңизди жеңил конфигурациялоо куралдары"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Консоль куралдары"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Редакторлор, шелдер, файл куралдары, терминалдар"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Иштеп түзүү"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
-msgstr "C жана C++ иштеп чыгуу библиотекалары, программалар жана include файлдары"
+msgstr ""
+"C жана C++ иштеп чыгуу библиотекалары, программалар жана include файлдары"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Документация"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linux жана Free Software жөнүндөгү китептер жана HOWTOлар"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux стандарттык базасы. Үчүнчү тараптык иштеп чыгуучулардын тиркемелерин колдоо"
+msgstr ""
+"Linux стандарттык базасы. Үчүнчү тараптык иштеп чыгуучулардын тиркемелерин "
+"колдоо"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Веб-сервери"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab сервери"
 
-#: share/meta-task/compssUsers.pl:81
-#: share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
+#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Файрволл/Маршруттагыч"
 
-#: share/meta-task/compssUsers.pl:82
-#: share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
+#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Интернет дарбазасы"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Почта/Жаңылыктар"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix почта сервери, Inn жаңылыктар сервери"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Каталогдор сервери"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP сервери"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "DNS жана NIS"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Файл жана принтер бөлүшүү сервери"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS сервери, Samba сервери"
 
-#: share/meta-task/compssUsers.pl:105
-#: share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
+#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
 #, c-format
 msgid "Database"
 msgstr "Берилиштер базасы"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL жана MySQL берилиштер базасынын сервери"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Почта"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix почта сервери"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL же MySQL берилиштер базасынын сервери"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Тармак сервери"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS сервери, SMB сервери, Proxy сервери, ssh сервери"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Графикалык чөйрө"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE иш станциясы"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
-msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"
-msgstr "K Desktop Environment - негизги графикалык чөйрө, кошумча куралдар коллекциясы менен"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment - негизги графикалык чөйрө, кошумча куралдар "
+"коллекциясы менен"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME иш станциясы"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
-msgid "A graphical environment with user-friendly set of applications and desktop tools"
-msgstr "Колдонуучуга ыңгайлашкан тиркемелерин жана иш столунун кураларын камтыган графикалык чөйрө"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Колдонуучуга ыңгайлашкан тиркемелерин жана иш столунун кураларын камтыган "
+"графикалык чөйрө"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE иш столу"
@@ -663,54 +662,52 @@ msgstr ""
 "Колдонуучуга ыңгайлашкан тиркемелерин жана иш столунун кураларын камтыган "
 "графикалык чөйрө"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Башка графикалык иш столдору"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, ж.б. "
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Утилиталар"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH сервери"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin узактан башкаруу сервери"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Тармак аспаптары/Мониторинг"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Мониторинг аспаптар, процесс эсептүүчүлөр, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva Усталары"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Серверди ырастоо усталары"
@@ -729,14 +726,15 @@ msgstr ""
 msgid ""
 "Some important packages did not get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
+"\"\n"
 msgstr ""
 "Кээбир негизги пакеттер туура эмес орнотулду.\n"
 "CDROM түзүлүшү же диск бузук болушу мүмкүн.\n"
-"Киргизилген дискти \"rpm -qpl media/main/*.rpm\" коммандасы менен текшериңиз\n"
+"Киргизилген дискти \"rpm -qpl media/main/*.rpm\" коммандасы менен "
+"текшериңиз\n"
 
-#: steps_auto_install.pm:71
-#: steps_stdio.pm:27
+#: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
 msgid "Entering step `%s'\n"
 msgstr "`%s' кадамына өтүү аракети\n"
@@ -760,7 +758,8 @@ msgstr "Xorg жай башталып жатат. Күтө туруңуз..."
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandriva Linux. If that occurs, you can try a text install instead. For this,\n"
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
+"this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Системага жетеринче ресурс жетпей жатат. Mandriva Linux системасын\n"
@@ -808,17 +807,17 @@ msgstr "Мына '%s' иш столдун алдын ала көрүнүшү."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Чоң көрүнүштү көрүү үчүн сүрөткө басыңыз"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Пакеттердин группасын тандоо"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Пакеттерди өз алдынча тандоо"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Жалпы көлөмү: %d / %d Мб"
@@ -875,8 +874,12 @@ msgstr "%s сактоо үчүн"
 
 #: steps_gtk.pm:452
 #, c-format
-msgid "You can not select this package as there is not enough space left to install it"
-msgstr "Сиз бул пакетти тандап алалбайсыз, анткени аны орнотуу үчүн жетеринче бош боштук жок"
+msgid ""
+"You can not select this package as there is not enough space left to install "
+"it"
+msgstr ""
+"Сиз бул пакетти тандап алалбайсыз, анткени аны орнотуу үчүн жетеринче бош "
+"боштук жок"
 
 #: steps_gtk.pm:455
 #, c-format
@@ -933,12 +936,12 @@ msgstr "Минималдык орнотуу"
 msgid "Software Management"
 msgstr "Пакеттерди башкаруу"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Сиз орнотууну каалаган пакеттерди тандаңыз"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Орнотуу"
@@ -964,7 +967,7 @@ msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d- пакет"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Жыйынтык"
@@ -974,7 +977,7 @@ msgstr "Жыйынтык"
 msgid "Configure"
 msgstr "Конфигурация"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "конфигурацияланбаган"
@@ -984,7 +987,7 @@ msgstr "конфигурацияланбаган"
 msgid "Media Selection"
 msgstr "Пакеттердин группасын тандоо"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -993,16 +996,20 @@ msgstr ""
 "Төмөнкү орнотуу булактары табылды.\n"
 "Эгерде кээбирин аттап өтүүнү кааласаңыз, анда аларды тандабай өтүңүз."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive before installation.\n"
-"It will then continue from the hard drive and the packages will remain available once the system is fully installed."
+"You have the option to copy the contents of the CDs onto the hard drive "
+"before installation.\n"
+"It will then continue from the hard drive and the packages will remain "
+"available once the system is fully installed."
 msgstr ""
-"Компакт-диск мазмунун орнотуудан мурун компьютер дискине көчүрүп алуу мүмкүн.\n"
-"Андан кийин орнотуу компьютер дискинен улантылат жана пакеттер толук системанын орнотулуп бүткөндөн кийин калышат."
+"Компакт-диск мазмунун орнотуудан мурун компьютер дискине көчүрүп алуу "
+"мүмкүн.\n"
+"Андан кийин орнотуу компьютер дискинен улантылат жана пакеттер толук "
+"системанын орнотулуп бүткөндөн кийин калышат."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "CD дискти толугу менен көчүрүү"
@@ -1022,59 +1029,49 @@ msgstr "Өзүңүздүн алиптакта картасын тандаңыз"
 msgid "Here is the full list of available keyboards:"
 msgstr "Мүмкүн болгон бардык клавиөлкөлөр тизмеси"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Орнотуу/Жаңылоо"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Бул орнотуубу же жаңылообу?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Орнотуу"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s жаңылоо"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "32bit тен 64bit ке жаңылоо мүмкүе эмес"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "64bit тен 32bit ке жаңылоо мүмкүн эмес"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s үчүн шифрлөө ачкычы"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Орнотууну айну, система өчүп жандыруу"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Жаңы орнотуу"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Мурунку орнотууну жаңылоо (сунуш кылынбайт)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1093,48 +1090,64 @@ msgstr ""
 "Эскертүү : \"Жаңы орнотулуш\" тандоодон мурун, бардык жеке\n"
 "маалыматтарды архивдөө менен көчүрүп алышыңыз керек."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE конфигурацияланууда"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
-msgid "No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr "Өз жүктөлүү программасы үчүн жетеринче бош боштук калган жок! Орнотуу улантылат, бирок системанын жүктөлүшү үчүн DiskDrake менен баштапкы жүктөлүү бөлүгүн түзүү керек"
+msgid ""
+"No free space for 1MB bootstrap! Install will continue, but to boot your "
+"system, you'll need to create the bootstrap partition in DiskDrake"
+msgstr ""
+"Өз жүктөлүү программасы үчүн жетеринче бош боштук калган жок! Орнотуу "
+"улантылат, бирок системанын жүктөлүшү үчүн DiskDrake менен баштапкы жүктөлүү "
+"бөлүгүн түзүү керек"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
-msgid "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr "PPC PReP жүктөлүү бөлүгүн түзүү керек! Орнотуу улантылат, бирок системанын жүктөлүшү үчүн DiskDrake менен баштапкы жүктөлүү бөлүгүн түзүү керек"
+msgid ""
+"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
+"to boot your system, you'll need to create the bootstrap partition in "
+"DiskDrake"
+msgstr ""
+"PPC PReP жүктөлүү бөлүгүн түзүү керек! Орнотуу улантылат, бирок системанын "
+"жүктөлүшү үчүн DiskDrake менен баштапкы жүктөлүү бөлүгүн түзүү керек"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
-"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done.\n"
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "Компакт-дискти алмаштырыңыз!\n"
 "\"%s\" атту компакт-дискти киргизиңиз, андан кийин \"Ok\" баскычын басыңыз.\n"
-"Эгерде сизде жок болсо, анда ушул компакт-дисктен орнотууну айнуу үчүн \"Айнуу\" баскычын басыңыз."
+"Эгерде сизде жок болсо, анда ушул компакт-дисктен орнотууну айнуу үчүн "
+"\"Айнуу\" баскычын басыңыз."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Мүмкүн болгон пакеттер изделүүдө..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
-msgid "Your system does not have enough space left for installation or upgrade (%dMB > %dMB)"
-msgstr "Системаңыз орнотууга же жаңылоого жетеринче бош боштукка ээ эмес (%d МБ > %d МБ)"
+msgid ""
+"Your system does not have enough space left for installation or upgrade (%"
+"dMB > %dMB)"
+msgstr ""
+"Системаңыз орнотууга же жаңылоого жетеринче бош боштукка ээ эмес (%d МБ > %d "
+"МБ)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1143,52 +1156,52 @@ msgstr ""
 "Жүктөө же пакеттер тандоосун сактоону тандаңыз.\n"
 "Файлдар форматы автоматтык орнотууда түзүлгөн файлдар менен окшош."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Жүктөө"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Сактоо"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Туура эмес файл"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Иш столун тандоо"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Иштоо станцияңыздын иш столдун профилин тандап аласыз."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Тандалган өлчөм бар болгон боштуктан чоң"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Орнотуу тиби"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1197,82 +1210,82 @@ msgstr ""
 "Эч кандай пакеттер группасы тандалган жок.\n"
 "Минималдык орнотуу тибин тандаңыз:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X менен"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Башкы документация менен (сунушталат!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Чыныгы минималдуу орнотуулуш (атайын urpmi'сиз)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Орнотуу даярдалууда"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "%s пакети орнотуулууда"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Пакеттерди кабыл алууда ката пайда болду:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Буга карабай улантайынбы?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Кайталоо"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Бул пакетти аттап өтүү"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "\"%s\" ичинен бардык пакеттерди аттап өтүү"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Артка баруу жана орнотууга пакеттерди нандоо"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "%s пакетти орнотууда ката чыкты."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Орнотуулуштан кийинки ырастоолор"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "%s ичинде Update Modules топтомунун бар экендигин текшерип көрүңүз"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Жаңылоолор"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1293,113 +1306,131 @@ msgstr ""
 "\n"
 "Пакеттер орнотулсунбу?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s %s'да"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Техникалык жабдуу"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Добуш картасы"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Сизде ISA добуш карточкасы барбы?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
-msgid "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card"
-msgstr "Үн картасын ырастоо үчүн орнотуудан кийин \"alsaconf\" же \"sndconfig\" коммандаларын аткарыңыз"
+msgid ""
+"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
+"card"
+msgstr ""
+"Үн картасын ырастоо үчүн орнотуудан кийин \"alsaconf\" же \"sndconfig\" "
+"коммандаларын аткарыңыз"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "Эч кандай добуш карточкасы табылган жок. Орнотуудан кийин \"harddrake\" кайталап көрүңүз"
+msgstr ""
+"Эч кандай добуш карточкасы табылган жок. Орнотуудан кийин \"harddrake\" "
+"кайталап көрүңүз"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Графикалык интерфейс"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Тармак жана Интернет"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Проксилер"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "ырасталды"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Коосуздук деңгээли"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Файервол"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "активдештирилди"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "өчүк"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Сиз X'ти ырастаган жоксуз.Чындап ушуну каалайсызбы?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Система жүктөөгүч даярдалууда..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Күтө туруңуз, бул бир нече убакытты алышы мүмкүн..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
-msgid "You appear to have an OldWorld or Unknown machine, the yaboot bootloader will not work for you. The install will continue, but you'll need to use BootX or some other means to boot your machine. The kernel argument for the root fs is: root=%s"
-msgstr "Сиз өтө эски тарыхый же белгисиз машинанын ээси окшойсуз жана 'yaboot' баштапкы жүктөгүчү машинаңызга иштебеши мүмкүн. Орнотуу улантылат, бирок системанын жүктөлүшү үчүн 'BootX' же башка жүктөгүч колдонулушу керек. Ядронун тамырдык файл системанын параметри: root=%s"
+msgid ""
+"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+"will not work for you. The install will continue, but you'll need to use "
+"BootX or some other means to boot your machine. The kernel argument for the "
+"root fs is: root=%s"
+msgstr ""
+"Сиз өтө эски тарыхый же белгисиз машинанын ээси окшойсуз жана 'yaboot' "
+"баштапкы жүктөгүчү машинаңызга иштебеши мүмкүн. Орнотуу улантылат, бирок "
+"системанын жүктөлүшү үчүн 'BootX' же башка жүктөгүч колдонулушу керек. "
+"Ядронун тамырдык файл системанын параметри: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
-msgid "In this security level, access to the files in the Windows partition is restricted to the administrator."
-msgstr "Бул коопсудук деңгээлде Windows бөлүмүндө жайгашкан файларда жетүү жалгыз гана администраторга уруксат берилген."
+msgid ""
+"In this security level, access to the files in the Windows partition is "
+"restricted to the administrator."
+msgstr ""
+"Бул коопсудук деңгээлде Windows бөлүмүндө жайгашкан файларда жетүү жалгыз "
+"гана администраторга уруксат берилген."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s ичине бош флоппи дискти киргизиңиз"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Авто орнотуу флоппини түзүү..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1410,7 +1441,7 @@ msgstr ""
 "\n"
 "Сиз чындап азыр чыгууну каалайсызбы?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Конфигурациялар"
@@ -1423,8 +1454,7 @@ msgid ""
 "Language"
 msgstr "Тил тандоо"
 
-#: steps_list.pm:16
-#: steps_list.pm:23
+#: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
 msgstr "Локализация"
@@ -1443,16 +1473,14 @@ msgid ""
 "Mouse"
 msgstr "Чычкан"
 
-#: steps_list.pm:19
-#: steps_list.pm:20
+#: steps_list.pm:19 steps_list.pm:20
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
 msgstr "Таш дискти аныктоо"
 
-#: steps_list.pm:21
-#: steps_list.pm:22
+#: steps_list.pm:21 steps_list.pm:22
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
@@ -1480,8 +1508,7 @@ msgid ""
 "Partitioning"
 msgstr "Бөлүмдөргө бөлүү"
 
-#: steps_list.pm:27
-#: steps_list.pm:28
+#: steps_list.pm:27 steps_list.pm:28
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
@@ -1509,24 +1536,21 @@ msgid ""
 "Users"
 msgstr "Колдонуучулар"
 
-#: steps_list.pm:36
-#: steps_list.pm:37
+#: steps_list.pm:36 steps_list.pm:37
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Networking"
 msgstr "Тармактар"
 
-#: steps_list.pm:38
-#: steps_list.pm:39
+#: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Bootloader"
 msgstr "Баштапкы жүктөгүч"
 
-#: steps_list.pm:40
-#: steps_list.pm:41
+#: steps_list.pm:40 steps_list.pm:41
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
@@ -1540,8 +1564,7 @@ msgid ""
 "Summary"
 msgstr "Жыйынтык"
 
-#: steps_list.pm:44
-#: steps_list.pm:45
+#: steps_list.pm:44 steps_list.pm:45
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
@@ -1562,6 +1585,30 @@ msgid ""
 "Exit"
 msgstr "Чыгуу"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Сиздин иш столуңуз USBде"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% ачык кодду Mandriva Linux дистрибутиви"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Linux'ту Mandriva One менен аралап үйрөнүү"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Толук Mandriva Linux иш столу жардам менен"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: ар бирдин керектеген дистрибутив"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "%s файлы жүктөөлүп жатат..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "32bit тен 64bit ке жаңылоо мүмкүе эмес"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "64bit тен 32bit ке жаңылоо мүмкүн эмес"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
@@ -1586,24 +1633,33 @@ msgstr "Чыгуу"
 #~ "\n"
 #~ "\n"
 #~ "Сиз бул серверлерди орнотууну каалайсызбы?\n"
+
 #~ msgid "IceWm Desktop"
 #~ msgstr "IceWm иш столу"
+
 #~ msgid "Replay"
 #~ msgstr "Кайталоо"
+
 #~ msgid "Automated"
 #~ msgstr "Автоматтык"
+
 #~ msgid "Save packages selection"
 #~ msgstr "Тандалган пакеттерди сактоо"
+
 #~ msgid "All"
 #~ msgstr "Бардыгы"
+
 #~ msgid "TV card"
 #~ msgstr "ТВ-карта"
+
 #~ msgid "Boot"
 #~ msgstr "Жүктөө"
+
 #~ msgid ""
 #~ "_: Keep these entry short\n"
 #~ "Authentication"
 #~ msgstr "Аутентификация"
+
 #~ msgid "Gwenview"
 #~ msgstr "Gwenview"
 
@@ -1618,10 +1674,12 @@ msgstr "Чыгуу"
 #, fuzzy
 #~ msgid "Choosing packages"
 #~ msgstr "Орнотуу үчүн пакеттерди тандаңыз"
+
 #~ msgid "Users"
 #~ msgstr "Колдонуучулар"
+
 #~ msgid "Networking"
 #~ msgstr "Тармактар"
+
 #~ msgid "Configure X"
 #~ msgstr "X конфигурациялоо"
-
diff --git a/perl-install/install/share/po/lt.po b/perl-install/install/share/po/lt.po
index a530f1bbb..d3d7a3785 100644
--- a/perl-install/install/share/po/lt.po
+++ b/perl-install/install/share/po/lt.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2000-12-23 13:50+0200\n"
 "Last-Translator: Mykolas Norvai­as <Myka@centras.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -15,31 +15,6 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -75,24 +50,24 @@ msgstr "Tinklo interfeisas"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, fuzzy, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "Jungiamasi prie atvaizdžio (mirror), kad gautume prieinamų paketų sąrašą"
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -100,69 +75,69 @@ msgid ""
 msgstr ""
 "Jungiamasi prie atvaizdžio (mirror), kad gautume prieinamų paketų sąrašą"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Pasirink atvaizdį (mirror), iš kurio imti paketus"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Aplankas"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Adapteris %s: %s"
 
-#: any.pm:328
+#: any.pm:334
 #, fuzzy, c-format
 msgid "Looking at packages already installed..."
 msgstr "Tu negali atžymėti šio paketo. Jis jau yra įdiegtas"
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Ieškoma atnaujintinų paketų"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -174,18 +149,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Perkrauti"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -194,72 +169,72 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Klaida skaitant bylą %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Ruošiamasi įdiegti šiuos paketus"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Tinklas"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Pasirinkite kitą vardą."
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Jau yra tokia byla. Užrašyti ant jos?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Priėjimas draudžiamas"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr ""
 
-#: any.pm:1236
+#: any.pm:1242
 #, fuzzy, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Aš daugiau negaliu pridėti nė vieno skirsnio"
 
-#: any.pm:1244
+#: any.pm:1250
 #, fuzzy, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Tu gali pasirinkti kitas kalbas, kurios bus prieinamos po įdiegimo"
@@ -270,11 +245,15 @@ msgid "Installation"
 msgstr "Įdiegiama"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Nustatymai"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -301,22 +280,22 @@ msgstr "Paleidžiamas tinklas"
 msgid "Bringing down the network"
 msgstr "Išjungiamas tinklas"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Išsaugoti į bylą"
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "aptiktas prievade %s"
@@ -358,27 +337,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Įvyko klaida"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d įdiegimo operacijos nepavyko"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Įdiegiamas paketas %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "KDE darbo stotis"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Biuro darbo stotis"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -387,7 +366,7 @@ msgstr ""
 "Biuro programos: tekstų redaktoriai (OpenOffice.org Writer, Kword), "
 "skaičiuoklės (OpenOffice.org Calc, Kspread), pdf peržiūros programos ir pan."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -396,33 +375,33 @@ msgstr ""
 "Biuro programos: tekstų redaktoriai (kword, abiword), skaičiuoklės (kspread, "
 "gnumeric), pdf peržiūros programos ir pan."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Žaidimų stotis"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 "Programos pasilinksminimui: lentos, strateginiai, kortų žaidimai ir pan."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedija stotis"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Garso ir vaizdo grojimo/redagavimo programos"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Interneto stotis"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -431,211 +410,193 @@ msgstr ""
 "Rinkinys įrankių skaityti ir siųsti paštą bei naujienas (pine, mutt, tin) ir "
 "naršyti žiniatinklį (WWW)"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Tinklo Kompiuteris, X klientas"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ar tu nori išbandyti nustatymus?"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsolės įrankiai"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktoriai, shell'ai, bylų įrankiai, terminalai"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Programavimas"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C bei C++ kūrimo bibliotekos, programos ir include bylos"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentacija"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Knygos ir HOWTO apie Linux ir Free Software"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, fuzzy, c-format
 msgid "Web Server"
 msgstr "serveris"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Grupinis darbas"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab serveris"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Serveris, Firewall/Routeris"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, fuzzy, c-format
 msgid "Internet gateway"
 msgstr "Priėjimas prie Interneto"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/Byla/_Nauja"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Serveris, Duomenų bazių"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "Atstatyti iš diskelio"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP serveris"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domeno vardas"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Spausdinimo serveris"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "NIS serveris"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Serveris, Duomenų bazių"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Serveris, Tinklapių/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Paštas"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, fuzzy, c-format
 msgid "Postfix mail server"
 msgstr "Serveris, Duomenų bazių"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "Serveris, Tinklo Kompiuterio serveris"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE darbo stotis"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -644,12 +605,12 @@ msgstr ""
 "The K Desktop Environment, pagrindinė grafinė aplinka su dideliu rinkiniu "
 "pritaikytų programų"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome darbo stotis"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -658,7 +619,7 @@ msgstr ""
 "Grafinė aplinka su vartotojui draugiškų programų ir darbalaukio įrankių "
 "rinkiniu"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Darbastalis"
@@ -672,54 +633,52 @@ msgstr ""
 "Grafinė aplinka su vartotojui draugiškų programų ir darbalaukio įrankių "
 "rinkiniu"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Kiti grafiniai darbalaukiai"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, fuzzy, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "IceWM, Window Maker, Enlightenment, Fvwm ir pan."
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Naudės"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "NIS serveris"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "įrenginys"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Interneto konfigūravimas"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Tinklo konfigūravimas"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "Prisijungti prie interneto"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Nustatyti spausdintuvą"
@@ -818,17 +777,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Paketų grupių pasirinkimas"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Atskirų paketų pasirinkimas"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Bendras dydis: %d / %d MB"
@@ -946,12 +905,12 @@ msgstr "Išmesti"
 msgid "Software Management"
 msgstr "Programinės įrangos tvarkyklė"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Pasirink paketus, kuriuos tu nori įdiegti"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Įdiegiama"
@@ -979,7 +938,7 @@ msgstr[0] "%d paketų"
 msgstr[1] "%d paketų"
 msgstr[2] "%d paketų"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Apibendrinimas"
@@ -989,7 +948,7 @@ msgstr "Apibendrinimas"
 msgid "Configure"
 msgstr "Nustatyti"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "iš naujo nustatyti"
@@ -999,14 +958,14 @@ msgstr "iš naujo nustatyti"
 msgid "Media Selection"
 msgstr "Paketų grupių pasirinkimas"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1015,7 +974,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1035,59 +994,49 @@ msgstr "Prašom pasirinkti klaviatūros išdėstymą"
 msgid "Here is the full list of available keyboards:"
 msgstr "Čia yra galimų klaviatūrų sąrašas"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, fuzzy, c-format
 msgid "Install/Upgrade"
 msgstr "Įdiegti/Atnaujinti"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, fuzzy, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Ar tai įdiegimas, ar atnaujinimas?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Įdiegti"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, fuzzy, c-format
 msgid "Upgrade %s"
 msgstr "Atnaujinimas"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, fuzzy, c-format
 msgid "Encryption key for %s"
 msgstr "Slaptažodžiai nesutampa"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Įdiegiama"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1099,24 +1048,24 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Nustatome IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1124,7 +1073,7 @@ msgid ""
 "DiskDrake"
 msgstr ""
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1137,153 +1086,153 @@ msgstr ""
 "Prašom įkišti CD su užrašu „%s“ į kaupiklį, tada paspausk Gerai.\n"
 "Jei tu jo neturi, spausk Nutraukti, kad išvengtum įdiegimo iš šio CD."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Ieškomi galimi paketai"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Įkelti"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Išsaugoti"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Įkelti bylą"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Paketų grupių pasirinkimas"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, fuzzy, c-format
 msgid "Type of install"
 msgstr "Pasirink paketą įdiegimui"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, fuzzy, c-format
 msgid "With X"
 msgstr "Palauk"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Ruošiamas įdiegimas"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Įdiegiamas paketas %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Įvyko klaida, bandant sutvarkyti paketus:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Vis tiek tęsti?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Išsaugoti paketų pasirinkimą"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Įvyko klaida, įdiegiant paketus:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Konfigūracija po įdiegimo"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Atnaujinimai"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1296,95 +1245,95 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s iš %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Geležis"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, fuzzy, c-format
 msgid "Sound card"
 msgstr "Standartinė"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, fuzzy, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Ar turi dar vieną?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, fuzzy, c-format
 msgid "Graphical interface"
 msgstr "X paleidžiant"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Tinklas & Internetas"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Tarpinės stotys (proxies)"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, fuzzy, c-format
 msgid "configured"
 msgstr "iš naujo nustatyti"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Saugumo lygis"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, fuzzy, c-format
 msgid "Firewall"
 msgstr "Serveris, Firewall/Routeris"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, fuzzy, c-format
 msgid "activated"
 msgstr "Aktyvus"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "uždraustas"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Ruošiama įkrovos tvarkyklė"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1393,24 +1342,24 @@ msgid ""
 "root fs is: root=%s"
 msgstr ""
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Įdėk tuščią diskelį į kaupiklį %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Kuriamas automatinio įdiegimo diskelis"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1421,7 +1370,7 @@ msgstr ""
 "\n"
 "Ar tu nori išeiti dabar?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Sveikinimai"
@@ -1566,6 +1515,10 @@ msgid ""
 msgstr "Išeiti"
 
 #, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Išsaugoti į bylą"
+
+#, fuzzy
 #~ msgid "IceWm Desktop"
 #~ msgstr "Darbastalis"
 
diff --git a/perl-install/install/share/po/ltg.po b/perl-install/install/share/po/ltg.po
index 06aac689b..ea180293a 100644
--- a/perl-install/install/share/po/ltg.po
+++ b/perl-install/install/share/po/ltg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2006-09-24 17:51+0200\n"
 "Last-Translator: Māris Laureckis <marlau@inbox.lv>\n"
 "Language-Team: Latgalian <linux@latgola.lv>\n"
@@ -14,31 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -79,17 +54,17 @@ msgstr "Teiklys (FTP)"
 msgid "Network (NFS)"
 msgstr "Teiklys (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Voi spūguļservera URL?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL juosasuoc ar ftp:// voi http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -97,7 +72,7 @@ msgstr ""
 "Pīsaslādzu Mandriva Linux teimekļam, lai sajimtu pīejamū spūguļserveru "
 "sarokstu..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -106,47 +81,47 @@ msgstr ""
 "Dasasliegšona Mandriva Linux teimekļam cīta naveiksmi, lai sajimtu pīejamū "
 "spūguļserveru sarokstu"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Izavielejit spūguļserveri, nu kura jimt pakūtnis"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS uzstuodeišona"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Lyudzu, īvodit hosta vuordu i jiusu NFS datu nesieja katalogu"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Kaids ir NFS monteišonys hosta vuords?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Katalogs"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -155,22 +130,22 @@ msgstr ""
 "Iz ituo spūguļservera navar atrast pakūtņu saroksta failu. Puorbaudit, voi "
 "atsarūn pareizā vītā."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Mekleju jau īprīkš uzinstaleituos pakūtnis..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Mekleju uzlobuojamuos pakūtnis"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Teik nūdzāstys pakūtnis pyrms atjaunynuošonys..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -182,18 +157,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Puorsuoknēt"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -206,72 +181,72 @@ msgstr ""
 "\n"
 "Voi teišom gribit nūjimt ituos pakūtnis?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Kliuda, nūlosūt failu %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Sekojūši diski tika puorsaukti:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (īprīkš tika saukta kai %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Teiklys"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Lyudzu, izavielejit datu nesieju"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fails jau eksistej. Voi puorrakstēt pa viersu?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Pīeja līgta"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Naveiksmeigs NFS vuords"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Napareizs datu nesiejs %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Navar izveiduot ekrana attālus pyrms sadaļu izveidis"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ekrana attāli byus pīejami piec instaleišonys %s"
@@ -282,11 +257,15 @@ msgid "Installation"
 msgstr "Instalaceja"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Konfiguraceja"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -311,22 +290,22 @@ msgstr "Īdorbynoju teiklu"
 msgid "Bringing down the network"
 msgstr "Atslādzu teiklu"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Teik šursyuteiti fail %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Teik kopātys dažys pakūtnis lītuošonai nuokūtnē"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Nūteik kopeišona"
@@ -368,27 +347,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Atkluota kliuda"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Instalaceja naizadeve"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Instaleju pakūtni %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Dorba staceja"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Biroja dators"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -397,7 +376,7 @@ msgstr ""
 "Biroja programmys: teksta procesori (OpenOffice.org Writer, Kword), "
 "izkluojlopys (OpenOffice.org Calc, Kspread), PDF skateituoji, u.c."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -406,32 +385,32 @@ msgstr ""
 "Biroja programmys: teksta procesori (kword, abiword), izkluojlopys (kspread, "
 "gnumeric), pdf skateituoji, u.c."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Spēļu dators"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Izklaidis programmys: arkade, goldaspēlis, strategeja u.c."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedeju dators"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Skanis i video atskaņuošonys/redigeišonys programmys"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Interneta dators"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -440,211 +419,193 @@ msgstr ""
 "Reiku komplekts, lai laseitu i syuteitu postu voi jaunumus (mutt, tin..), i "
 "puorlyukuotu Puorstaipteiklu"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Teikla dators (klients)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienti dažaidim protokolim, īskaitūt ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Reiki datora konfigureišonys atvīgluošonai"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsolis reiki"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktori, čaulys, failu reiki, terminali"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Izstruode"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C i C++ izstruodis bibliotekys, programmys i īkļautī faili"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentaceja"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Gruomotys i vaicuojumu par Linux i Breivū programmaturu"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linuks Standarta Bāze. Trešū izstruoduoju aplikaceju atbolsts"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Puorstaipteikla (Web) servers"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab servers"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Gunsmyurs/Maršrutizators"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Interneta vuorteja"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Posts/Jauns"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix posta servers, Inn ziņu servers"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Katalogu Servers"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP servers"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "DNS i NIS servers"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Failu un Printeru Kūplītuošonys servers"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS servers, Samba servers"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Datubāzis"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL i MySQL datubāžu servers"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Teimeklis/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Posts"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix posta servers"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL voi MySQL datubāžu servers"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Teikla datoru servers"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS servers, SMB servers, storpnīkservers (Proxy), ssh servers"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafiskuo vide"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE dorba staceja"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -653,12 +614,12 @@ msgstr ""
 "K Desktop Environment, golvonuo grafiskuo vide kūpā ar papyldus reiku "
 "kolekceju"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome dorba staceja"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -667,7 +628,7 @@ msgstr ""
 "Grafiskuo vide ar lītuotuojam draudzeigu programmu komplektu i dorba "
 "viersmys reikim"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "IceWm Dorba viersma"
@@ -681,54 +642,52 @@ msgstr ""
 "Grafiskuo vide ar lītuotuojam draudzeigu programmu komplektu i dorba "
 "viersmys reikim"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Cytys grafiskuos dorba viersmys"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm u.c."
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Utilitys"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH servers"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin attuolynuotuos konfiguracejis servers "
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Teikla utilitys/puorraudzeiba"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Puorraudzeibys reiki, procesu uzskaite, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva paleigi"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Servera konfiguracejis paleigi"
@@ -828,17 +787,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakūtņu grupu izviele"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Atsevišku pakūtņu izviele"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Kūpejais izmārs: %d / %d MB"
@@ -957,12 +916,12 @@ msgstr "Minimala instaleišona"
 msgid "Software Management"
 msgstr "Programmaturys puorvaļdeišona"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Izavielejit pakūtnis, kū gribit instalēt"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Teik instaleits"
@@ -989,7 +948,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pakūtnis"
 msgstr[1] "%d pakūtnis"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Kūpsavylkums"
@@ -999,7 +958,7 @@ msgstr "Kūpsavylkums"
 msgid "Configure"
 msgstr "Konfigurēt"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "nav konfigurāts"
@@ -1009,7 +968,7 @@ msgstr "nav konfigurāts"
 msgid "Media Selection"
 msgstr "Pakūtņu grupu izviele"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1018,7 +977,7 @@ msgstr ""
 "Atrosti sekojūši instalacejis datu nesieji.\n"
 "Ja jius gribit izlaist dažus nu tim, jius tagad varit nūjimt atzeimi nu tim."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1031,7 +990,7 @@ msgstr ""
 "Taidā veidā turpynuosīs nu cītuo diska un pakūtnis byus pīejamys cikom "
 "sistema tiks piļneibā uzinstaleita."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopēt vysu kompaktdisku"
@@ -1051,59 +1010,49 @@ msgstr "Lyudzu izavielejit jiusu klaviaturys izkuortuojumu"
 msgid "Here is the full list of available keyboards:"
 msgstr "Ite ir pylns pīejamū klaviaturu saroksts"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalēt/Atjaunynuot"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Itei ir instaleišona voi atjaunynuošona?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalēt"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Atjaunynuot %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Šifreišonys atslāga deļ %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Instalaceja"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1115,17 +1064,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Teik konfigurāts IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1135,7 +1084,7 @@ msgstr ""
 "lai īluodātu sistemu, jiusim vajadzēs izveiduot suokneišonys programmys "
 "diska sadali programmā DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1146,7 +1095,7 @@ msgstr ""
 "turpynuosīs, bet lai īluodātu sistemu, jiusim vajadzēs izveiduot "
 "suokneišonys programmys diska sadali programmā DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1160,19 +1109,19 @@ msgstr ""
 "Ja jiusim nav ituo diska, nūspīdit Atceļt, lai nainstaleitu nu ituo "
 "kompaktdiska."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Mekleju pīejamuos pakūtnis"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1181,52 +1130,52 @@ msgstr ""
 "Lyudzu izavielejit īluodēt voi saglobuot pakūtņu izvieli.\n"
 "Formats ir taids pats, kai ar auto_install generātom failim."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Īluodēt"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Saglobuot"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Napareizs fails"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Pakūtņu grupu izviele"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Izvālātais apjūms ir leluoks nakai pīejamuo vīta"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Instalacejis tips"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1235,82 +1184,82 @@ msgstr ""
 "Jius naizavielēt nivīnu pakūtņu grupu.\n"
 "Lyudzu, izavielejit minimalū instalaceju, kaidu jius gribit:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Ar X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Ar pamatdokumentaceju (īteicams!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Patīši minimala instalaceja (īpaši bez urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Sagataveju instaleišonu"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Instaleju pakūtni %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Pakūtņu kuortuošonys laikā atkluota kliuda:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Tūmār turpynuot?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Saglobuot pakūtņu izvieli"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Pakūtņu instaleišonys laikā atkluota kliuda:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Piecinstaleišonys konfigureišona"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Lyudzu, puorsalīcynojit ka Update Modules atsarū īkuortā %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Atjaunynuojumi"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1332,28 +1281,28 @@ msgstr ""
 "\n"
 "Voi jius gribit instalēt atjaunynuojumus?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s iz %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Aparatura"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Skanis karte"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Vai jiusim ir ISA skanis karte?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1362,69 +1311,69 @@ msgstr ""
 "Piec instaleišonys palaidit \"alsaconf\" voi \"sndconfig\", lai konfigurātu "
 "jiusu skanis karti"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Nav atrosta skanis karte. Piec instaleišonys izmieginit \"harddrake\""
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafiskuo saskarne"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Teiklys & Internets"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Storpnīkserveri"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "konfigurāts"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Drūšeibys leimiņs"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Guņsmyurs"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktivizāts"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "atslāgts"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Jiusim nav nūkonfigurāts X servers. Voi jius asot puorlīcynuoti, ka jius tū "
 "gribit?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Sagataveju suokneituoju"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1437,7 +1386,7 @@ msgstr ""
 "juoizmontoj BootX voi kas cyts, lai īluodātu datoru. Kūdula arguments deļ "
 "root fs ir: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1446,17 +1395,17 @@ msgstr ""
 "Šymā drūšeibys leiminī, pīeeja Windows sadalis failim ir tikai "
 "administratoram."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Īlicit tukšu disketi īkuortā %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Sagataveju auto instaleišonys disketi"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1467,7 +1416,7 @@ msgstr ""
 "\n"
 "Voi tīšom gribit izīt tagad?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Apsveicam"
@@ -1611,6 +1560,9 @@ msgid ""
 "Exit"
 msgstr "Izīt"
 
+#~ msgid "Downloading file %s..."
+#~ msgstr "Teik šursyuteiti fail %s..."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/lv.po b/perl-install/install/share/po/lv.po
index 580f9d281..32da7d449 100644
--- a/perl-install/install/share/po/lv.po
+++ b/perl-install/install/share/po/lv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2002-09-27 17:45+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: Latvian <ll10nt@listes.murds.lv>\n"
@@ -16,31 +16,6 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -76,17 +51,17 @@ msgstr "Tīkls"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -94,7 +69,7 @@ msgstr ""
 "Pieslēdzos Mandriva Linux tīmeklim, lai saņemtu pieejamo spoguļserveru "
 "sarakstu sarakstu..."
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -103,69 +78,69 @@ msgstr ""
 "Pieslēdzos Mandriva Linux tīmeklim, lai saņemtu pieejamo spoguļserveru "
 "sarakstu sarakstu..."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Izvēlieties spoguļserveri, no kura ņemt pakotnes"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Katalogs"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Nevar atrast %s uz %s"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Meklēju jau iepriekš uzinstalētās pakotnes..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Meklēju uzlabojamās pakotnes"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -177,18 +152,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Pārstartēt"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -201,72 +176,72 @@ msgstr ""
 "\n"
 "Vai tiešām vēlaties noņemt šīs pakotnes?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Kļūda, nolasot failu %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Tiks instalētas sekojošas pakotnes"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Tīkls"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Lūdzu izvēlieties"
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fails jau eksistē. Pārrakstīt?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Pieeja liegta"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "pievienoju datu nesēju %s."
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Nevar izveidot ekrāna attēlus pirms sadaļu izveides"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ekrāna attēli būs pieejami pēc instalēšanas %s."
@@ -277,11 +252,15 @@ msgid "Installation"
 msgstr "Instalēju"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurācija"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -306,22 +285,22 @@ msgstr "Iedarbinu tīklu"
 msgid "Bringing down the network"
 msgstr "Atslēdzu tīklu"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Nosūtu failus..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Notiek noteikšana"
@@ -363,27 +342,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Atklāta kļūda"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Instalēšana neizdevās"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Instalēju pakotni %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Darbastacija"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Biroja dators"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -392,7 +371,7 @@ msgstr ""
 "Biroja programmas: teksta procesori (OpenOffice.org Writer, Kword), "
 "izklājlapas (OpenOffice.org Calc, Kspread), pdf skatītāji, u.c."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -401,32 +380,32 @@ msgstr ""
 "Biroja programmas: teksta procesori (kword, abiword), izklājlapas (kspread, "
 "gnumeric), pdf skatītāji, u.c."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Spēļu dators"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Izklaides programmas: arkāde, galdiņspēles, stratēģija u.c."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimēdiju dators"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Skaņas un video atskaņošanas/rediģēšanas programmas"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Interneta dators"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -435,211 +414,193 @@ msgstr ""
 "Rīku komplekts, lai lasītu un sūtītu pastu vai jaunumus (pine, mutt, tin..) "
 "un pārlūkotu Tīmekli"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Tīkla dators (klients)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienti dažādiem protokoliem, ieskaitot ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Rīki datora konfigurēšanas atvieglošanai"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsoles rīki"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktori, čaulas, failu rīki, termināļi"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Izstrāde"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C un C++ izstrādes bibliotēkas, programmas un include faili"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentācija"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Grāmatas un Howto faili par Linux un Brīvo programmatūru"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Web serveris"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "grupa"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab serveris"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Ugunsmūris/Maršrutizators"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Interneta vārteja"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/Fails/_Jauns"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix pasta serveris"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "Atjanot no CD"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP serveris"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domēna nosaukumu serveris"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Printera serveris"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Samba serveris"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Datubāzes"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, fuzzy, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL vai MySQL datubāzu serveris"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Tīmeklis/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Pasts"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, fuzzy, c-format
 msgid "Postfix mail server"
 msgstr "Postfix pasta serveris"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL vai MySQL datubāzu serveris"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Tīkla datoru serveris"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS serveris, SMB serveris, Proxy serveris, ssh serveris"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafiskā vide"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE darbastacija"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -647,12 +608,12 @@ msgid ""
 msgstr ""
 "K Desktop Environment, galvenā grafiskā vide kopā ar papildus rīku kolekciju"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome darbastacija"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -661,7 +622,7 @@ msgstr ""
 "Grafiskā vide ar lietotājiem draudzīgu programmu komplektu un darbavirsmas "
 "rīkiem"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Darbavirsma"
@@ -675,54 +636,52 @@ msgstr ""
 "Grafiskā vide ar lietotājiem draudzīgu programmu komplektu un darbavirsmas "
 "rīkiem"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Citas grafiskās darbavirsmas"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, fuzzy, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm u.c."
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Utilites"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH serveris"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Webmin serviss"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Mandriva termināļu servera konfigurācija"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Tīkla konfigurācija"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva Linux kontroles centrs"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Konfigurēju printeri \"%s\"..."
@@ -822,17 +781,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakotņu grupu izvēle"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Atsevišķu pakotņu izvēle"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Kopējais izmērs: %d / %d MB"
@@ -950,12 +909,12 @@ msgstr "Minimāla instalēšana"
 msgid "Software Management"
 msgstr "Software Management"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Izvēlieties pakotnes, ko vēlaties instalēt"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalēju"
@@ -983,7 +942,7 @@ msgstr[0] "%d pakotnes"
 msgstr[1] "%d pakotnes"
 msgstr[2] "%d pakotnes"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Kopsavilkums"
@@ -993,7 +952,7 @@ msgstr "Kopsavilkums"
 msgid "Configure"
 msgstr "Konfigurēt"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "pārkonfigurēt"
@@ -1003,14 +962,14 @@ msgstr "pārkonfigurēt"
 msgid "Media Selection"
 msgstr "Pakotņu grupu izvēle"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1019,7 +978,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1039,59 +998,49 @@ msgstr "Lūdzu izvēlieties jūsu tastatūras izkārtojumu"
 msgid "Here is the full list of available keyboards:"
 msgstr "Šeit ir pilns pieejamo tastatūru saraksts"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, fuzzy, c-format
 msgid "Install/Upgrade"
 msgstr "Instalēt/Atjaunināt"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, fuzzy, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Šī ir instalēšana vai atjaunināšana?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalēt"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, fuzzy, c-format
 msgid "Upgrade %s"
 msgstr "Atjaunināt"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, fuzzy, c-format
 msgid "Encryption key for %s"
 msgstr "Šifrēšanas atslēga"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Instalēju"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1103,17 +1052,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Konfigurēju IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, fuzzy, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1123,7 +1072,7 @@ msgstr ""
 "lai ielādētu sistēmu, Jums būs nepieciešams izveidot sāknēšanas programmas "
 "disaka sadaļu programmā DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, fuzzy, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1134,7 +1083,7 @@ msgstr ""
 "lai ielādētu sistēmu, Jums būs nepieciešams izveidot sāknēšanas programmas "
 "disaka sadaļu programmā DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1147,19 +1096,19 @@ msgstr ""
 "Lūdzu ielieciet iekārtā Cd-Rom \"%s\", kad tas ir izdarīts, nospiediet Labi\n"
 "Ja jums nav šī diska, nospiediet Atcelt, lai neinstalētu no šī Cd-Rom."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Meklēju pieejamās pakotnes"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1168,52 +1117,52 @@ msgstr ""
 "Lūdzu izvēlieties ielādēt vai saglabāt pakotnes no/uz disketes.\n"
 "Formāts ir tāds pats, kā ar auto_install ģenerētām disketēm."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Ielādēt"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Saglabāt"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Ielādēt failu"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Pakotņu grupu izvēle"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Izvēlētais apjoms ir lielāks nekā pieejamā vieta"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Instalācijas tips"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1222,82 +1171,82 @@ msgstr ""
 "Jūs neizvēlējāties nevienu pakotņu grupu.\n"
 "Lūdzu, izvēlieties minimālo instalāciju, kādu vēlaties:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Ar X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Ar pamatdokumentāciju (ieteicams!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Patiesi minimāla instalācija (īpaši bez urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Sagatavoju instalēšanu"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalēju pakotni %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Pakotņu kārtošanas laikā atklāta kļūda:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Tomēr turpināt?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Saglabāt pakotņu izvēli"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Pakotņu instalēšanas laikā atklāta kļūda:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Pēcinstalēšanas konfigurēšana"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, fuzzy, c-format
 msgid "Updates"
 msgstr "Atjaunināt"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, fuzzy, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1318,95 +1267,95 @@ msgstr ""
 "\n"
 "Vai Jūs vēlaties instalēt jauninājumus?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s uz %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Dzelži"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Skaņas karte"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Vai Jums ir ISA skaņas karte?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, fuzzy, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "Pēc instalēšanas palaidiet \"sndconfig\", lai konfigurētu skaņu karti"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Nav atrasta skaņu karte. Pēc instalēšanas izmēģiniet \"harddrake\""
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, fuzzy, c-format
 msgid "Graphical interface"
 msgstr "X pēc startēšanas"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Tīkls & Internets"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Profils: "
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, fuzzy, c-format
 msgid "configured"
 msgstr "pārkonfigurēt"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Drošības Līmenis"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Ugunssiena"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, fuzzy, c-format
 msgid "activated"
 msgstr "aktivizēt"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "aizliegts"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Sagatavoju sāknētāju"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, fuzzy, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1419,24 +1368,24 @@ msgstr ""
 "Instalēšana turpināsies, bet Jums būs jāizmanto\n"
 "BootX, lai ielādētu datoru"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Ielieciet tukšu disketi iekārtā %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Sagatavoju auto instalēšanas disketi"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1447,7 +1396,7 @@ msgstr ""
 "\n"
 "Vai tiešām vēlaties iziet tūlīt?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Apsveicam"
@@ -1592,6 +1541,10 @@ msgid ""
 msgstr "Iziet"
 
 #, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Nosūtu failus..."
+
+#, fuzzy
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/mk.po b/perl-install/install/share/po/mk.po
index c18b73156..24caeb0d5 100644
--- a/perl-install/install/share/po/mk.po
+++ b/perl-install/install/share/po/mk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2006-09-24 20:39-0700\n"
 "Last-Translator: Zoran Dimovski <zoki.dimovski@gmail.com>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -21,31 +21,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -86,17 +61,17 @@ msgstr "Мрежа (FTP)"
 msgid "Network (NFS)"
 msgstr "Мрежа (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL на огледалото?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL-то мора да започнува со „ftp://“ или „http://“"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -104,7 +79,7 @@ msgstr ""
 "Контактирање со веб сајтот на Мандрива Линукс за добивање на листата на "
 "огледала..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -113,71 +88,71 @@ msgstr ""
 "Не може да се воспостави врска веб страница на „Mandriva Linux“ за да се "
 "добие листата на достапни огледала"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Изберете огледало од кое да се преземат пакетите"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "Поставување на „NFS“"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 "Ве молиме внесете го името на домаќинот и директориумот на вашиот „NFS“ "
 "медиум"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Име на домаќинот каде е монтиран „NFS“ ?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Директориум"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Не мојажам да ја пронајдам hdlist датотеката на ова огледало"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Барање пакети што се веќе инсталирањен..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Барање пакети за надградба..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Отстранување на пакети поради надградување..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -189,18 +164,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Рестартирај"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -214,72 +189,72 @@ msgstr ""
 "\n"
 "Дали навистина сакате да се избришат овие пакети?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Грешка при читање на датотеката %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Следниве дискови се преименувани:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (претходно именувано како %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Мрежа"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Ве молиме изберете медиум"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Датотеката веќе постои. Да се запише врз неа?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Недозволен пристап"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Лошо „NFS“ име"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Невалиден медиум %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Не можат да се прават снимки на екран пред партицирање"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Екранските снимки ќе бидат достапни по инсталацијата во %s"
@@ -290,11 +265,15 @@ msgid "Installation"
 msgstr "Инсталација"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Конфигурација"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -320,22 +299,22 @@ msgstr "Подигање на мрежата"
 msgid "Bringing down the network"
 msgstr "Спуштање на мрежата"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Снимање на датотека %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Копирање на некои пакети на дискот за понатамошна употреба"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Копирањето е во тек"
@@ -377,27 +356,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Се случи грешка"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d неуспешни трансакциии на инсталацијата"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Инсталирање на пакетот %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Работна станица"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Канцелариски"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -407,7 +386,7 @@ msgstr ""
 "табеларни пресметки (OpenOffice.org Calc, Kspread), прегледувачи на „PDF“ "
 "итн."
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -416,32 +395,32 @@ msgstr ""
 "Канцелариски програми: обработка на текст (kword, abiword), табеларни "
 "пресметки (kspread, gnumeric), прегледувачи на „pdf“ итн."
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Станица за игри"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Забавни програми: аркадни, на табла, стратегија, итн."
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Мултимедијална станица"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Програми за пуштање и уредување на звук и видео"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Интернет станица"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -450,211 +429,193 @@ msgstr ""
 "Комплет алатки за читање и пракање е-пошта и вести (mutt, tin..) и "
 "прелистување на Интернет"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Мрежен компјутер (клиент)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клиенти за различни протоколи, вклучувајќи и „ssh“"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Алатки за лесно конфигурирање на вашиот компјутер"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Конзолски алатки"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Уредувачи, школки, алатки за датотеки, терминали"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Развој"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Развивачки датотеки за „C“ и „C++“, програми и „include“ датотеки"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Документација"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Книги и „Како да“ за „Linux“ и слободен софтвер"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "„Linux Standard Base“. Поддршка за апликации од други фирми"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Веб сервер"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Групи"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Сервер"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Firewall/Router"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Интернет gateway"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "Пошта/Вести"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "„Postfix“ сервер за пошта, „Inn“ сервер за вести"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Директориумски сервер"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "„FTP“ сервер"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Име на доменот и сервер за мрежни информации"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Сервер за споделување на датотеки и печатач"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "„NFS“ сервер, „Samba“ сервер"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "База на податоци"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "„PostgreSQL“ и „MySQL“ сервер за бази на податоци"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Пошта"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix сервер за пошта"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "„PostgreSQL“ или „MySQL“ сервер за бази на податоци"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Мрежен компјутер-сервер"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "„NFS“ сервер, „SMB“ сервер, „Proxy“ сервер, „ssh“ сервер"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Графичка околина"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "„KDE“ работна станица"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -663,12 +624,12 @@ msgstr ""
 "„К“ работна околина, основната графичка околина со додатна колекција на "
 "придружни алатки"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "„GNOME“ работна станица"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -676,7 +637,7 @@ msgid ""
 msgstr ""
 "Графичка околина со кориснички пакет на алатки и алатки за работната површина"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "„IceWm“ работна површина"
@@ -689,54 +650,52 @@ msgid ""
 msgstr ""
 "Графичка околина со кориснички пакет на алатки и алатки за работната површина"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Други графички работни околини"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, итн."
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Помошни алатки"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Сервер"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "„Webmin“"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "„Webmin“ оддалечен сервер за конфигурирање"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Мрежни помошни алатки/надгледување"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Алатки за надгледување, раководење на процеси, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "„Mandriva“ волшебници"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Волшебници за конфигурирање на сервер"
@@ -836,17 +795,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Групна селекција на пакети"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Подделна селекција на пакети"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Вкупна големина: %d / %d MB"
@@ -966,12 +925,12 @@ msgstr "Минимална инсталација"
 msgid "Software Management"
 msgstr "Менаџмент на софтвер"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Изберете ги пакетите што сакате да се инсталираат"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Инсталирање"
@@ -998,7 +957,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d пакети"
 msgstr[1] "%d пакети"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Резиме"
@@ -1008,7 +967,7 @@ msgstr "Резиме"
 msgid "Configure"
 msgstr "Конфигурирај"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "не е конфигурирано"
@@ -1018,7 +977,7 @@ msgstr "не е конфигурирано"
 msgid "Media Selection"
 msgstr "Групна селекција на пакети"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1027,7 +986,7 @@ msgstr ""
 "Пронајдени се следниве инсталациски медиуми.\n"
 "Ако сакате да отстранете некои, можете сега да ги дештиклирате."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1040,7 +999,7 @@ msgstr ""
 "Потоа, инсталацијата ќе продолжи од хард дискот и пакетите ќе бидат достапни "
 "се додека системот е целосно инсталиран."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Копирај ги сите CD-а"
@@ -1060,59 +1019,49 @@ msgstr "Изберете распоред на тастатура"
 msgid "Here is the full list of available keyboards:"
 msgstr "Ова е целосна листа на достапни тастатури"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Инсталирај/Надогради"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Дали е ова инсталација или надградба?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Инсталирај"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Надгради %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Криптирачки клуч за %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Инсталација"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1124,17 +1073,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Конфигурирање на IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1144,7 +1093,7 @@ msgstr ""
 "да го подигнете Вашиот систем, ќе треба да креирате bootstrap партиција во "
 "DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1155,7 +1104,7 @@ msgstr ""
 "за да го вклучите вашиот систем, ќе треба да креирате партиција за "
 "подигнување во „DiskDrake“"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1168,19 +1117,19 @@ msgstr ""
 "Внесете го CD-то со наслов \"%s\" во вашиот уред и притиснете \"Во ред\".\n"
 "Ако го немате, притиснете \"Откажи\" за да не инсталирате од ова CD."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Барање достапни пакети..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1189,52 +1138,52 @@ msgstr ""
 "Ве молиме изберете „вчитај“ или „зачувај“ го изборот на пакети\n"
 "Форматот е ист како за генерирани датотеки од „auto_install“."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Вчитај"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Зачувај"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Лоша датотека"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Групна селекција на пакети"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Избраната големина е поголема од слободниот простор"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Тип на инсталација"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1243,83 +1192,83 @@ msgstr ""
 "Не сте избрале ниту една група пакети.\n"
 "Изберете ја минималната инсталација што ја сакате:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Со X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Со основна документација (препорачано!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Вистински минимална инсталација (без urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Подготовка на инсталацијата"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Инсталирање на пакетот %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Се случи грешка во подредувањето на пакетите:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Да продолжиме?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Зачувување на селекцијата пакети"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Се случи грешка во инсталирањето на пакетите:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Пост-инсталациона конфигурација"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Ве молиме проверете дали медиумот со модулите за надградување е во уредот %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Надградби"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1340,28 +1289,28 @@ msgstr ""
 "\n"
 "Дали сакате да ги инсталирате надградбите?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Хардвер(машински дел)"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Звучна картичка"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Дали имате ISA звучна картичка?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1370,69 +1319,69 @@ msgstr ""
 "По инсталацијата вклучете \"alsaconf\" или \"sndconfig\" за да ја "
 "конфигурирате звучаната картичка"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Не е детектирана звучна картичка. Обидете се со \"harddrake\" по "
 "инсталацијата"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Графички интерфејс"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Мрежа и Интернет"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Прокси"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "конфигурирано"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Ниво на сигурност"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "активиран"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "оневозможено"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Се уште го ш конфигурирано Х. Дали навистина сакаш да го направиш ова?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Подговтвување на подигачот..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1445,7 +1394,7 @@ msgstr ""
 "или некои други средства за подигнување на вашата машина. Аргументот на "
 "кернелот за „root fs“ е следниов: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1454,17 +1403,17 @@ msgstr ""
 "Во ова безбедносно ниво, пристап до датотеките кои се наоѓаат на „Windows“ "
 "партицијата е дозволен само на администраторот."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Внесете празна дискета во %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Создавање дискета за авто-инсталација..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1475,7 +1424,7 @@ msgstr ""
 "\n"
 "Дали навистина сакате сега да напуштите?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Честитки"
@@ -1619,6 +1568,9 @@ msgid ""
 "Exit"
 msgstr "Излез"
 
+#~ msgid "Downloading file %s..."
+#~ msgstr "Снимање на датотека %s..."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/mn.po b/perl-install/install/share/po/mn.po
index 1e4ea60d4..a26866083 100644
--- a/perl-install/install/share/po/mn.po
+++ b/perl-install/install/share/po/mn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2004-01-02 00:35+0100\n"
 "Last-Translator: Sanlig Badral <Badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
@@ -18,31 +18,6 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -78,92 +53,92 @@ msgstr "Сүлжээ"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, fuzzy, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "сайт жигсаалт аас."
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr "сайт жигсаалт аас."
 
-#: any.pm:195
+#: any.pm:197
 #, fuzzy, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Сонгох"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Лавлах"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "%s: %s-ийг холбож чадахгүй: %s\n"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -175,18 +150,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Дахин ачаал"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -195,74 +170,74 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:815
+#: any.pm:821
 #, fuzzy, c-format
 msgid "Error reading file %s"
 msgstr "Файл уншихад алдаа\n"
 
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Дараах багцууд суулгагдах гэж байна"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "ТЭ"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Сүлжээ"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr ""
 "Нөөцлөх зөөврийн төхөөрөмжөө\n"
 "сонгоно уу."
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Файл?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Хандалт нурлаа"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr ""
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Хуваалт үүсгэхийн өмнө агшин дэлгэцүүдийг хийж чадахгүй"
 
-#: any.pm:1244
+#: any.pm:1250
 #, fuzzy, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "ямх"
@@ -273,11 +248,15 @@ msgid "Installation"
 msgstr "Суулгалт"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Тохиргоо"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -300,22 +279,22 @@ msgstr ""
 msgid "Bringing down the network"
 msgstr ""
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Файлууд илгээж байна..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "ямх"
@@ -357,296 +336,278 @@ msgstr ""
 msgid "An error occurred:"
 msgstr ""
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Суулгалт боломжтой"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Суулгалтын ангилалыг сонгох"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "LAN Тохируулга"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, fuzzy, c-format
 msgid "Office Workstation"
 msgstr "Албан газар"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
 "(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, fuzzy, c-format
 msgid "Game station"
 msgstr "Тоглоом"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, fuzzy, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Зугаа цэнгэл"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Мультимедиа"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, fuzzy, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Дуу"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "Интернэт"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "аас"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Сүлжээ"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "аас"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, fuzzy, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Засварлагчууд"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Хөгжүүлэл"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, fuzzy, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C C"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Баримтжуулалт"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, fuzzy, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Стандарт"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, fuzzy, c-format
 msgid "Web Server"
 msgstr "Вэб"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "бүлэг"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, fuzzy, c-format
 msgid "Kolab Server"
 msgstr "Самба"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Интернэт гарц"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/Файл/_Шинэ"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Мэйл"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "Сэргээх Илгээгч"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP Сервер"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Домэйн Нэрний Сервер"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Хэвлэгч"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Самба"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Өгөгдлийн сан"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Мэйл"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, fuzzy, c-format
 msgid "Postfix mail server"
 msgstr "Мэйл"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "Сүлжээ"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, fuzzy, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Итгэмжилэгч"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, fuzzy, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "Ажилын талбар аас"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "KDE"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, fuzzy, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "аас"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Ширээний компьютер"
@@ -658,54 +619,52 @@ msgid ""
 "applications and desktop tools"
 msgstr "аас"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, fuzzy, c-format
 msgid "Other Graphical Desktops"
 msgstr "Бусад"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, fuzzy, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Цонх"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, fuzzy, c-format
 msgid "Utilities"
 msgstr "Филлипинни"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Вэб дуран"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Терминал Сервер"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Сүлжээ толидох"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "Мандрива удирдлагын төв"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "\"%s\" хэвлэгч дээр хэвлэж байна"
@@ -795,17 +754,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, fuzzy, c-format
 msgid "Package Group Selection"
 msgstr "Пакет Групп"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Тусдаа дан багц сонгох"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, fuzzy, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Нийт хэмжээ"
@@ -922,12 +881,12 @@ msgstr ""
 msgid "Software Management"
 msgstr ""
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Сонгохыг хүсэж буй багцаа сонгоно уу"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Суулгалт"
@@ -954,7 +913,7 @@ msgid_plural "%d packages"
 msgstr[0] "Тааруухан багц"
 msgstr[1] "Тааруухан багц"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Дүгнэлт"
@@ -964,7 +923,7 @@ msgstr "Дүгнэлт"
 msgid "Configure"
 msgstr "Тохируулах"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr ""
@@ -974,14 +933,14 @@ msgstr ""
 msgid "Media Selection"
 msgstr "Пакет Групп"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -990,7 +949,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1010,59 +969,49 @@ msgstr "Та гарын байрлалаа сонгоно уу"
 msgid "Here is the full list of available keyboards:"
 msgstr "бол бүрэн жигсаалт аас"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr ""
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Суулга"
 
-#: steps_interactive.pm:147
-#, c-format
-msgid "Upgrade %s"
-msgstr ""
-
 #: steps_interactive.pm:151
 #, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgid "Upgrade %s"
 msgstr ""
 
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Суулгалт"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1074,24 +1023,24 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE-г тохируулах"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, fuzzy, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr "Үгүй вы ямх"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, fuzzy, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1099,7 +1048,7 @@ msgid ""
 "DiskDrake"
 msgstr "Үгүй вы ямх"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1108,153 +1057,153 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr ""
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr "ачаалах бол."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Процессор ачаалж байна"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Хадгалах"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Файлыг ачаалах"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "Гном"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Пакет Групп"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Сонгогдсон хэмжээ нь боломжтой зайнаас их байна"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, fuzzy, c-format
 msgid "Type of install"
 msgstr "Төрөл аас"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, fuzzy, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr "Та бүлэг аас вы:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr ""
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, fuzzy, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "үгүй"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Суулгалтын бэлтгэл"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, fuzzy, c-format
 msgid "Go on anyway?"
 msgstr "Очих?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Хадгалах"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Багцуудыг суулгахад алдаа гарлаа:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Суулгалтын тохируулгыг батал"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, fuzzy, c-format
 msgid "Updates"
 msgstr "Шинэчлэх"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, fuzzy, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1267,95 +1216,95 @@ msgid ""
 "Do you want to install the updates?"
 msgstr "Та г вы Интернэт г вы?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s -д %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Техник хангамж"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Дууны карт"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Та ISA дууны карттай юу?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, fuzzy, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "Ажиллуулах"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, fuzzy, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Үгүй Reyna"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr ""
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, fuzzy, c-format
 msgid "Network & Internet"
 msgstr "Сүлжээ"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Польш"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, fuzzy, c-format
 msgid "configured"
 msgstr "Тохируулах"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Хамгаалалтын төвшин"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "хаалттай"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Та Х-г тохируулаагүй байна. Та үүнийг хийхдээ итгэлтэй байна уу?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr ""
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1364,24 +1313,24 @@ msgid ""
 "root fs is: root=%s"
 msgstr ""
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, fuzzy, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Оруулах ямх"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, fuzzy, c-format
 msgid "Creating auto install floppy..."
 msgstr "Үүсгэж байна."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, fuzzy, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1389,7 +1338,7 @@ msgid ""
 "Do you really want to quit now?"
 msgstr "г вы?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, fuzzy, c-format
 msgid "Congratulations"
 msgstr "Баяр хүргэе!"
@@ -1534,6 +1483,10 @@ msgid ""
 msgstr "Гарах"
 
 #, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Файлууд илгээж байна..."
+
+#, fuzzy
 #~ msgid "IceWm Desktop"
 #~ msgstr "Ширээний компьютер"
 
diff --git a/perl-install/install/share/po/ms.po b/perl-install/install/share/po/ms.po
index e6b1d5a1a..c5e3481bb 100644
--- a/perl-install/install/share/po/ms.po
+++ b/perl-install/install/share/po/ms.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2008-05-01 14:16+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -14,31 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
@@ -74,92 +49,92 @@ msgstr "Pelayan FTP"
 msgid "Network (NFS)"
 msgstr "Pelayan Rangkaian"
 
-#: any.pm:163
+#: any.pm:165
 #, fuzzy, c-format
 msgid "URL of the mirror?"
 msgstr "URL untuk IG"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr ""
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: any.pm:225
+#: any.pm:227
 #, fuzzy, c-format
 msgid "NFS setup"
 msgstr "Tetapan Halaman"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, fuzzy, c-format
 msgid "Hostname missing"
 msgstr "Pakej Hilang"
 
-#: any.pm:231
+#: any.pm:233
 #, fuzzy, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Nama Direktori mesti dimulakan dengan slash"
 
-#: any.pm:235
+#: any.pm:237
 #, fuzzy, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Perkongsian NFS Terlekap"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Direktori"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Ralat pada baris %d: %s"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 
-#: any.pm:362
+#: any.pm:368
 #, fuzzy, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Mencari pakej untuk dinaiktaraf..."
 
-#: any.pm:381
+#: any.pm:387
 #, fuzzy, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Ralat berlaku bila mencari pakej untuk dinaiktaraf."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -171,18 +146,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Boot semula"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -191,72 +166,72 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:815
+#: any.pm:821
 #, fuzzy, c-format
 msgid "Error reading file %s"
 msgstr "Ralat mengimport fail %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Peranti audio berikut telah dikesan."
 
-#: any.pm:1024
+#: any.pm:1030
 #, fuzzy, c-format
 msgid "%s (previously named as %s)"
 msgstr "&Simpan Imej Sebagai"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Rangkaian"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Utiliti Media Mudah Alih"
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fail Khas peranti telah wujud dalam gugusan"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Izin ditolak"
 
-#: any.pm:1172
+#: any.pm:1178
 #, fuzzy, c-format
 msgid "Bad NFS name"
 msgstr "Tetap Nama Imej"
 
-#: any.pm:1193
+#: any.pm:1199
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "Media Storan"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr ""
 
-#: any.pm:1244
+#: any.pm:1250
 #, fuzzy, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "dalam"
@@ -267,11 +242,15 @@ msgid "Installation"
 msgstr "Pemasangan sekecil mungkin"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurasikan"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, fuzzy, c-format
 msgid "You must also format %s"
@@ -294,22 +273,22 @@ msgstr "Pelayan Rangkaian Lama"
 msgid "Bringing down the network"
 msgstr "Pelayan Rangkaian Lama"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Extension &fail:"
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "&Dalam pelayar web"
@@ -353,296 +332,278 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Ralat telah berlaku"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Pelaksanaan gpg gagal (%d)\n"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Memasang pakej %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "StesyenKerja"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, fuzzy, c-format
 msgid "Office Workstation"
 msgstr "Pejabat/Produktiviti"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
 "(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, fuzzy, c-format
 msgid "Game station"
 msgstr "Permainan memori"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Kekunci Multimedia"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, fuzzy, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Bunyi dan"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "Internet Bergrafik"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "dan dan dan"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Klien Pelayan Terminal"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, fuzzy, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "protokol"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ujian"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, fuzzy, c-format
 msgid "Console Tools"
 msgstr "Alatan Pentadbiran"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, fuzzy, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Penyunting fail"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Pembangunan"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, fuzzy, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Pustaka dan fail selitan untuk Oaf."
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentasi"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, fuzzy, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "dan on dan Bebas"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, fuzzy, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Asas"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Pelayan Web"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Pelayan Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, fuzzy, c-format
 msgid "Firewall/Router"
 msgstr "_Konfigurasikan Firewall"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, fuzzy, c-format
 msgid "Internet gateway"
 msgstr "Internet Bergrafik"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "Pelayan Berita"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Sistem InterNetNews (INN), pelayan berita Usenet."
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Pelayan Direktori"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Pelayan FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Name=Pelayan Fail Awam"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Monitor status Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Pangkalan Data"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Mel"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, fuzzy, c-format
 msgid "Postfix mail server"
 msgstr "Pelayan Nama DNS"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "Pelayan Rangkaian Lama"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, fuzzy, c-format
 msgid "Graphical Environment"
 msgstr "Internet Bergrafik"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "Menu KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, fuzzy, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "Desktop Persekitaran asas"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome-Breakout"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, fuzzy, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "A pengguna dan"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Persekitaran Desktop"
@@ -654,54 +615,52 @@ msgid ""
 "applications and desktop tools"
 msgstr "A pengguna dan"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, fuzzy, c-format
 msgid "Other Graphical Desktops"
 msgstr "Pada Semua Desktop"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Utiliti"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "Pelayan FTP"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Alatan tetapan pelayan dan klien fax"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Aplet pengawas rangkaian"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva Galaxy"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Sila tetapkan pelayan PXE"
@@ -794,17 +753,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, fuzzy, c-format
 msgid "Package Group Selection"
 msgstr "Barisatas pilihan (toggle)"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, fuzzy, c-format
 msgid "Individual package selection"
 msgstr "Barisatas pilihan (toggle)"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, fuzzy, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Saiz lajur automatik"
@@ -925,12 +884,12 @@ msgstr "Pasang plugin baru"
 msgid "Software Management"
 msgstr "Pengurusan Perisian"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, fuzzy, c-format
 msgid "Choose the packages you want to install"
 msgstr "Pilih alatan yang anda hendak guna"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Memasang"
@@ -957,7 +916,7 @@ msgid_plural "%d packages"
 msgstr[0] "Pelihat Pakej"
 msgstr[1] "    Pakej"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Ringkasan"
@@ -967,7 +926,7 @@ msgstr "Ringkasan"
 msgid "Configure"
 msgstr "Buat konfigurasi"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "Tiada"
@@ -977,14 +936,14 @@ msgstr "Tiada"
 msgid "Media Selection"
 msgstr "Barisatas pilihan (toggle)"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -993,7 +952,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, fuzzy, c-format
 msgid "Copy whole CDs"
 msgstr "Main CD audio"
@@ -1013,59 +972,49 @@ msgstr "Sila pilih jenis logmasuk anda:"
 msgid "Here is the full list of available keyboards:"
 msgstr "penuh"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, fuzzy, c-format
 msgid "Install/Upgrade"
 msgstr "Pasang plugin baru"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Katalaluan diperlukan, ini adalah dokumen yang dienkrip"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, fuzzy, c-format
 msgid "Upgrade %s"
 msgstr "Naiktaraf"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, fuzzy, c-format
 msgid "Encryption key for %s"
 msgstr "&Cari Bantuan"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Pemasangan sekecil mungkin"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1077,24 +1026,24 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, fuzzy, c-format
 msgid "Configuring IDE"
 msgstr "IDE Anjuta"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, fuzzy, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr "Tidak Install dalam"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, fuzzy, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1102,7 +1051,7 @@ msgid ""
 "DiskDrake"
 msgstr "Tidak Install dalam"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1111,155 +1060,155 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, fuzzy, c-format
 msgid "Looking for available packages..."
 msgstr ""
 "Tiada penerangan didapati untuk %s.\n"
 "\n"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr "on."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Muatan"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Simpan"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Extension &fail:"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Barisatas pilihan (toggle)"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, fuzzy, c-format
 msgid "Type of install"
 msgstr "Jenis per&nomboran:"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, fuzzy, c-format
 msgid "With X"
 msgstr "Dengan penghujung:"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "asas"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, fuzzy, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "tidak"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, fuzzy, c-format
 msgid "Preparing installation"
 msgstr "Pemasangan sekecil mungkin"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Memasang pakej %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Tedapat ralat menyusun pakej:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Teruskan juga?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Ulangcuba"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Langkau pakej ini"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Langkau semua pakej dari media \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Kembali ke pemilihan pakej dan media"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Tedapat ralat memasang pakej %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Tetapan pasca pemasangan"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Kemaskini"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1281,95 +1230,95 @@ msgstr ""
 "\n"
 "Adakah anda mahu memasang kemaskini tersebut?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s pada %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Perkakasan"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Kad bunyi"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr ""
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Tiada kad bunyi dikesan. Cuba \"harddrake\" selepas pemasangan."
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Antaramuka Bergrafik"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Rangkaian & Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proksi"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "ditetapkan"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Tahap Keselamatan"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "dimatikan"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Menyediakan pemuatboot..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1382,24 +1331,24 @@ msgstr ""
 "anda perlu menggunakan BootX atau sebarang cara lain untuk memboot mesin "
 "anda. Hujah kernel untuk sistemfail root adalah: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Masukkan cakera liut kosong dalam pemacu %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Mencipta cakera liut auto pasang..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1407,7 +1356,7 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Tahniah"
@@ -1552,6 +1501,10 @@ msgid ""
 msgstr "Keluar"
 
 #, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Extension &fail:"
+
+#, fuzzy
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/mt.po b/perl-install/install/share/po/mt.po
index 9e80300cf..8a953622a 100644
--- a/perl-install/install/share/po/mt.po
+++ b/perl-install/install/share/po/mt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2004-10-04 18:45+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -17,31 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -77,17 +52,17 @@ msgstr "Network (FTP)"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL tal-mera?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -95,7 +70,7 @@ msgstr ""
 "Qed nikkuntattja l-website ta' Mandriva Linux biex nikseb lista tal-mirja "
 "disponibbli"
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -104,69 +79,69 @@ msgstr ""
 "Qed nikkuntattja l-website ta' Mandriva Linux biex nikseb lista tal-mirja "
 "disponibbli"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Agħżel mera minn fejn trid iġġib il-pakketti"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Direttorju"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Ma nistax insib fajl hdlist fuq din il-mera"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Qed naqra l-pakketti diġà nstallati..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Qed insib pakketti x'naġġorna"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -178,18 +153,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Irributja"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -202,72 +177,72 @@ msgstr ""
 "\n"
 "Żgur li trid tneħħi dawn il-pakketti?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Problema fil-qari tal-fajl %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "- %s tneħħa\n"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "PFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Network"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Jekk jogħġbok agħżel wieħed"
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fajl diġà jeżisti. Tuża lilu?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Permess miċħud"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "ġie miżjud is-sors %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Ma nistax nieħu ritratti tal-iskrin qabel toħloq il-partizzjonijiet"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ir-ritratti jkunu disponibbli wara l-installazzjoni f' %s"
@@ -278,11 +253,15 @@ msgid "Installation"
 msgstr "Qed ninstalla"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurazzjoni"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -307,22 +286,22 @@ msgstr "Qed intella' n-network"
 msgid "Bringing down the network"
 msgstr "Qed inniżżel in-network"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Qed nibgħat fajls..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Għaddej l-għarfien"
@@ -364,27 +343,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Inqalgħet problema"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d tranżazzjonijiet ta' installazzjoni fallew"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Qed jinstalla il-pakkett %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Workstation"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Kompjuter tal-Uffiċċju"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -393,7 +372,7 @@ msgstr ""
 "Programmi tal-uffiċċju: wordprocessors (OpenOffice.org Writer, Kword), "
 "spreadsheet (OpenOffice.org Calc, Kspread) eċċ"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -402,32 +381,32 @@ msgstr ""
 "Programmi tal-uffiċċju: wordprocessors (kword, abiword), spreadsheet "
 "(kspread, gnumeric) eċċ"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Logħob"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programmi ta' divertiment: logħob tal-arcaDES, karti, strateġija eċċ"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedja"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programmi għad-daqq u editjar ta' awdjo u video"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internet"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -435,211 +414,193 @@ msgid ""
 msgstr ""
 "Sett għodda biex taqra u tibgħat imejl u \"news\", u biex tibbrawżja l-web"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Kompjuter fuq network (klijent)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klijenti għal protokolli differenti, eż. SSH"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Għodda biex tiffaċilita l-konfigurazzjoni tal-kompjuter"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Għodda tal-konsol"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Edituri, shells, għodda tal-fajls, terminals"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Żviluppar"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Libreriji, programmi u fajls għal żviluppar C u C++"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentazzjoni"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Kotba u \"HOWTO\" dwar il-Linux u Softwer Ħieles"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Sapport ta' programmi ta' terzi partiti"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Server tal-web"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "Grupp"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Server Kolab"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Firewall/Router"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Gateway tal-internet"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/File/_Ġdid"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Server tal-imejl Postfix"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "Direttorju minn fejn trid tirrestawra"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "DNS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Server tal-ismijiet tad-dominji"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Server tal-printer"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Server Samba"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, fuzzy, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Server tad-database PostgreSQL jew MySQL"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Imejl"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Server tal-imejl Postfix"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "Server tad-database PostgreSQL jew MySQL"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Kompjuter Server tan-Network"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Servers NFS, SMB, Proxy, ssh"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ambjent Grafiku"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "Stazzjon KDE"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -648,19 +609,19 @@ msgstr ""
 "K Desktop Environment, l-interfaċċja grafika bażi, b'għażla ta' għodda "
 "jakkumpanjawha"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Stazzjon GNOME"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Desktop"
@@ -672,54 +633,52 @@ msgid ""
 "applications and desktop tools"
 msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Desktops Grafiċi Oħrajn"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, fuzzy, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, eċċ"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, fuzzy, c-format
 msgid "Utilities"
 msgstr "Filippini"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "Server SSH"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Webcam"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Konfigurazzjoni tat-Terminal Server"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Monitoraġġ tan-network"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
 msgstr "<b>Prodotti Mandriva</b>"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Ma stajtx nikkonfigura l-printer \"%s\"!"
@@ -819,17 +778,17 @@ msgstr ""
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Għażla ta' gruppi ta' pakketti"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Agħżel pakketti individwalment"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Daqs totali: %d / %d MB"
@@ -947,12 +906,12 @@ msgstr "Installazzjoni minima"
 msgid "Software Management"
 msgstr "Maniġġjar ta' softwer"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Agħżel il-pakketti li trid tinstalla"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Qed ninstalla"
@@ -979,7 +938,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pakketti"
 msgstr[1] "%d pakketti"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Sommarju"
@@ -989,7 +948,7 @@ msgstr "Sommarju"
 msgid "Configure"
 msgstr "Ikkonfigura"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "mhux konfigurat"
@@ -999,7 +958,7 @@ msgstr "mhux konfigurat"
 msgid "Media Selection"
 msgstr "Għażla ta' gruppi ta' pakketti"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1008,7 +967,7 @@ msgstr ""
 "Dawn is-sorsi ta' installazzjoni instabu.\n"
 "Jekk trid taqbeż uħud minnhom, tista' tneħħi l-marka issa."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1017,7 +976,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -1037,59 +996,49 @@ msgstr "Jekk jogħġbok agħżel tqassim tat-tastiera"
 msgid "Here is the full list of available keyboards:"
 msgstr "Din hi lista sħiħa tat-tastieri disponibbli"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installa/Aġġorna"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Din hija installazzjoni ġdida jew aġġornament?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installa"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Aġġorna %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Ċifrarju għal %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Qed ninstalla"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1101,17 +1050,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Qed nikkonfigura IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1120,7 +1069,7 @@ msgstr ""
 "M'hemmx spazju għal bootstrap ta' 1MB. L-installazzjoni se tkompli, imma "
 "biex tħaddem is-sistema trid toħloq partizzjoni bootstrap f' Diskdrake."
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, fuzzy, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1130,7 +1079,7 @@ msgstr ""
 "M'hemmx spazju għal bootstrap ta' 1MB. L-installazzjoni se tkompli, imma "
 "biex tħaddem is-sistema trid toħloq partizzjoni bootstrap f' Diskdrake."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1145,19 +1094,19 @@ msgstr ""
 "Jekk m'għandekx din id-diska, agħfas \"Ikkanċella\" biex taqbeż il-pakketti "
 "li qegħdin fuqha."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Qed insib pakketti disponibbli"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1166,52 +1115,52 @@ msgstr ""
 "Jekk jogħġbok agħżel \"ikteb\" jew \"aqra\" l-għażla tal-pakketti fuq\n"
 "flopi. Il-format huwa l-istess bħal diski flopi ġenerati bl-auto_install."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, fuzzy, c-format
 msgid "Load"
 msgstr "XLoad"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Ikteb"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "fajl veru"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, fuzzy, c-format
 msgid "KDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Għażla ta' gruppi ta' pakketti"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Id-daqs tal-għażla huwa ikbar mill-ispazju disponibbli"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tip ta' installazzjoni"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1220,82 +1169,82 @@ msgstr ""
 "Għadek m'għażilt ebda grupp ta' pakketti\n"
 "Jekk jogħġbok agħżel installazzjoni minima li trid:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Bl-XWindows"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "B' dokumentazzjoni bażika (rakkomandat)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Installazzjoni verament minima (mingħajr urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Qed nipprepara l-installazzjoni"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Qed jinstalla il-pakkett %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Kien hemm problema fl-ordni tal-pakketti:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Trid tkompli xorta?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Ikteb l-għażla ta' pakketti"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Kien hemm problema fl-installazzjoni tal-pakketti:"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Konfigurazzjoni ta' wara l-installazzjoni"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Aġġornamenti"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1318,28 +1267,28 @@ msgstr ""
 "\n"
 "Trid tinstalla dawn l-aġġornamenti?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s fuq %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Ħardwer"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Kard awdjo"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Għandek kard tal-awdjo ISA?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1348,69 +1297,69 @@ msgstr ""
 "Ħaddem \"alsaconf\" jew \"sndconfig\" wara l-installazzjoni biex "
 "tikkonfigura l-kard awdjo."
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Ebda kard tal-awdjo ma nstabet. Ipprova ħaddem \"harddrake\" wara l-"
 "installazzjoni"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfaċċja grafika"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Network u internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxies"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "konfigurat"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Livell ta' sigurtà"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Firewallr"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "attivat"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "mitfi"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Għadek ma kkonfigurajtx X. Żgur trid hekk?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Qed nipprepara l-bootloader"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, fuzzy, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1423,7 +1372,7 @@ msgstr ""
 "L-installazzjoni se tkompli, imma trid tuża BootX biex \n"
 "ittella' l-Linux."
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1432,17 +1381,17 @@ msgstr ""
 "F'dan il-livell ta' sigurtà, l-aċċess għall-fajls fuq il-partizzjoni tal-"
 "Windows huwa ristrett għall-amministratur."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Daħħal flopi vojta fid-drajv %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Qed jinħoloq flopi awto-installazzjoni"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1453,7 +1402,7 @@ msgstr ""
 "\n"
 "Trid toħroġ issa?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Prosit"
@@ -1597,6 +1546,10 @@ msgid ""
 "Exit"
 msgstr "Oħroġ"
 
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Qed nibgħat fajls..."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/nb.po b/perl-install/install/share/po/nb.po
index 3783c6b81..4d94aaa6a 100644
--- a/perl-install/install/share/po/nb.po
+++ b/perl-install/install/share/po/nb.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-04-07 19:11+0200\n"
 "Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
@@ -30,31 +30,6 @@ msgstr ""
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Ditt skrivebord på en USB-penn"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Den hundre prosent åpen kildekode-distribusjonen, Mandriva Linux"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Utforsk lett Linux med Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Et komplett Mandriva Linux-skrivebord"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distribusjonen for alles behov"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -94,24 +69,25 @@ msgstr "Nettverk (FTP)"
 msgid "Network (NFS)"
 msgstr "Nettverk (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Nettadresse til speilet?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL må starte med ftp:// eller http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "Kontakter nettstedet til Mandriva Linux for å få listen over tilgjengelige "
 "speil..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -120,47 +96,47 @@ msgstr ""
 "Klarte ikke å kontakte nettstedet til Mandriva Linux for å få listen over "
 "tilgjengelige speil"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Velg et speil som pakkene kan hentes fra"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-oppsett"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Tast inn vertsnavnet og mappen til ditt NFS-medie"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Vertsnavn mangler"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Mappenavnet må starte med \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Vertsnavn til NFS-monteringen ?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Katalog"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Ekstra"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -169,22 +145,22 @@ msgstr ""
 "Kan ikke finne pakkelistefil på dette speilet. Kontrollér at adressen er "
 "riktig."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ser på pakker som allerede er installert..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Finner pakker som skal oppgraderes..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Fjerner pakker før oppgradering..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -195,27 +171,32 @@ msgid ""
 "To upgrade with KDE 3.5 and your personal settings preserved, \n"
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
-"Du har bestemt deg for å oppgradere systemet ditt til %s. KDE 3.5 ble oppdaget <br> på systemet ditt. Dette installasjonsprogrammet kan ikke ta vare på KDE 3.5 i en oppgradering. Hvis du velger å fortsette vil KDE 3 byttes ut med KDE 4 og du vil miste alle dine personlige KDE-innstillinger . <br> Vær vennlig å starte systemet på nytt for å oppgradere med Mandrivas panelverktøy for oppgradering hvis du vil beholde KDE 3.5 og dine personlige innstillinger."
 "Du har bestemt deg for å oppgradere systemet ditt til %s. KDE 3.5 ble "
 "oppdaget <br> på systemet ditt. Dette installasjonsprogrammet kan ikke ta "
 "vare på KDE 3.5 i en oppgradering. Hvis du velger å fortsette vil KDE 3 "
 "byttes ut med KDE 4 og du vil miste alle dine personlige KDE-innstillinger . "
 "<br> Vær vennlig å starte systemet på nytt for å oppgradere med Mandrivas "
 "panelverktøy for oppgradering hvis du vil beholde KDE 3.5 og dine personlige "
-"innstillinger."
+"innstillinger.Du har bestemt deg for å oppgradere systemet ditt til %s. KDE "
+"3.5 ble oppdaget <br> på systemet ditt. Dette installasjonsprogrammet kan "
+"ikke ta vare på KDE 3.5 i en oppgradering. Hvis du velger å fortsette vil "
+"KDE 3 byttes ut med KDE 4 og du vil miste alle dine personlige KDE-"
+"innstillinger . <br> Vær vennlig å starte systemet på nytt for å oppgradere "
+"med Mandrivas panelverktøy for oppgradering hvis du vil beholde KDE 3.5 og "
+"dine personlige innstillinger."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Restart"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Fortsett"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -229,72 +210,72 @@ msgstr ""
 " \n"
 "Ønsker du å fjerne disse pakkene?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Feil ved lesing av fil %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "De(n) følgende disken(e) fikk nytt navn:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (tidligere kalt %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Nettverk"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Velg et medie"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Filen eksisterer allerede. Overskriv?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Adgang nektet"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Ugyldig NFS-navn"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Feil på media %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Jeg kan ikke ta skjembilder før partisjonering."
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjermbilder vil være tilgjengelig etter installasjon i %s"
@@ -305,11 +286,15 @@ msgid "Installation"
 msgstr "Installasjon"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Oppsett"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -334,22 +319,22 @@ msgstr "Henter opp nettverket"
 msgid "Bringing down the network"
 msgstr "Tar ned nettverket"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Vennligst vent, henter fil"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Laster ned fil %s..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiér noen pakker på disken for framtidig bruk"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiering pågår"
@@ -393,27 +378,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "En feil oppstod:"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d mislykket installasjonstransaksjon"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installasjon av pakker feilet:"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Kontorarbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -422,7 +407,7 @@ msgstr ""
 "Kontorstøtteprogrammer: tekstbehandlere (OpenOffice.org Writer, Kword), "
 "regneark (OpenOffice.org Calc, Kspread), PDF-framvisere, etc"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -431,32 +416,32 @@ msgstr ""
 "Kontorstøtteprogrammer: tekstbehandlere (kword, abiword), regneark (kspread, "
 "gnumeric), pdf-framvisere etc"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Spillstasjon"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Underholdningsprogrammer: arkade, brettspill, strategi, etc"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediastasjon"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Lyd- og videoavspilling/redigeringsprogrammer"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internettstasjon"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -465,211 +450,193 @@ msgstr ""
 "Sett med verktøy for å lese og sende e-post og njus (mutt, tin..) og til å "
 "surfe på nettet"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Nettverksmaskin (klient)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienter for forskjellige protokoller inkludert ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Verktøy for å forenkle oppsettet av maskinen din"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsollverktøy"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Tekstprogrammer, skall, filverktøy, terminaler"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Utvikling"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C- og C++-utviklingsbibliotek, -programmer og include-filer"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Bøker og Howto's om Linux og fri programvare"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Støtte for tredjeparts programvare"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Webtjener"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Gruppevare"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab-tjener"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Brannmur/ruter"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internett-gateway"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "E-post/Njus"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix e-posttjener, Inn njustjener"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Katalogtjener"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-tjener"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domenenavn- og nettverksinformasjons-tjener"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fil- og Skriverdelingstjener"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS-Tjener, Samba-tjener"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL- og MySQL-databasetjener"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "E-post"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix e-posttjener"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL eller MySQL-databasetjener"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Nettverksmaskintjener"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-tjener, SMB-tjener, Proxy-tjener, SSH-tjener"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafisk miljø"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -678,12 +645,12 @@ msgstr ""
 "K Desktop Environment, grunnleggende grafisk miljø med en samling av "
 "passende verktøy"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -692,7 +659,7 @@ msgstr ""
 "Et grafisk miljø med et brukervennlig sett av programmer og "
 "skrivebordsverktøy"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE-skrivebord"
@@ -702,56 +669,56 @@ msgstr "LXDE-skrivebord"
 msgid ""
 "A lightweight & fast graphical environment with user-friendly set of "
 "applications and desktop tools"
-msgstr "Et lettvekts og raskt grafisk miljø med et brukervennlig sett av programmer og skrivebordsverktøy"
+msgstr ""
+"Et lettvekts og raskt grafisk miljø med et brukervennlig sett av programmer "
+"og skrivebordsverktøy"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andre grafiske skrivebord"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm etc"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Verktøy"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-tjener"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin Fjernadministrasjonstjener"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Nettverks-verktøy/overvåkning"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Overvårkningsverktøy, prosessbokføring, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva-veivisere"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Veivisere til å sette opp tjener"
@@ -851,17 +818,17 @@ msgstr "Her er et  forhåndsbilde av '%s'-skrivebordet."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klikk på bildene for å se et større forhåndsbilde"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Valg pakkegruppe"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuelt pakkevalg"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Total størrelse: %d / %d MB"
@@ -980,12 +947,12 @@ msgstr "Minimal installasjon"
 msgid "Software Management"
 msgstr "Programvarehåndtering"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Velg pakkene du ønsker å installere"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installerer"
@@ -1012,7 +979,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pakke"
 msgstr[1] "%d pakker"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Oppsummering"
@@ -1022,7 +989,7 @@ msgstr "Oppsummering"
 msgid "Configure"
 msgstr "Sett opp"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "ikke satt opp"
@@ -1032,7 +999,7 @@ msgstr "ikke satt opp"
 msgid "Media Selection"
 msgstr "Velg media"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1041,7 +1008,7 @@ msgstr ""
 "Følgende installasjonsmedia har blitt funnet.\n"
 "Hvis du vill hoppe over noen av de kan du velge de vekk nå."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1054,7 +1021,7 @@ msgstr ""
 "Den vil da fortsette fra harddisken og pakkene vil forbli tilgjengelige når "
 "systemet er fullstendig installert."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiér hele CDer"
@@ -1074,59 +1041,49 @@ msgstr "Velg ditt tastaturoppsett"
 msgid "Here is the full list of available keyboards:"
 msgstr "Her er den komplette listen over tilgjengelige tastatur"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installer/Oppgrader"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Er dette en installasjon eller en oppgradering?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installér"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Oppgrader %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Oppgradering fra en 32-bit til en 64-bit distribusjon er ikke støttet"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Oppgradering fra en 64-bit til en 32-bit distribusjon er ikke støttet"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Krypteringsnøkkel for %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Avbryt installasjonen, start systemet på nytt"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Ny installasjon"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Oppgrader forrige versjon (ikke anbefalt)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1137,23 +1094,26 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Installasjonsprogrammet har oppdaget at du har et Mandriva Linux-system som ikke kan oppgraderes til %s.<br> <br> En ny installasjon som fjerner den forrige er anbefalt.<br> <br> Advarsel: du bør sikkerhetskopiere alle dine personlige data før du velger \"Ny installasjon\"."
 "Installasjonsprogrammet har oppdaget at du har et Mandriva Linux-system som "
 "ikke kan oppgraderes til %s.<br> <br> En ny installasjon som fjerner den "
 "forrige er anbefalt.<br> <br> Advarsel: du bør sikkerhetskopiere alle dine "
-"personlige data før du velger \"Ny installasjon\"."
+"personlige data før du velger \"Ny installasjon\".Installasjonsprogrammet "
+"har oppdaget at du har et Mandriva Linux-system som ikke kan oppgraderes til "
+"%s.<br> <br> En ny installasjon som fjerner den forrige er anbefalt.<br> "
+"<br> Advarsel: du bør sikkerhetskopiere alle dine personlige data før du "
+"velger \"Ny installasjon\"."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Setter opp IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1162,7 +1122,7 @@ msgstr ""
 "Det er ikke plass for 1 MB bootstrap! Installasjonen vil fortsette, men for "
 "å boote systemet ditt, må du lage en bootstrap-partisjon i DiskDrake"
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1173,7 +1133,7 @@ msgstr ""
 "å kunne starte systemet ditt vil du måtte opprette en bootstrap-partisjon i "
 "DiskDrake"
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1186,12 +1146,12 @@ msgstr ""
 "Sett inn CDen merket «%s» i stasjonen og trykk Ok når du er ferdig.\n"
 "Hvis du ikke har den, trykk Avbryt for å unngå installasjon fra denne CDen."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Søker etter tilgjengelige pakker"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1200,7 +1160,7 @@ msgstr ""
 "Systemet har ikke nok gjenværende diskplass for installasjon eller "
 "oppgradering (%dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1209,54 +1169,54 @@ msgstr ""
 "Velg lagre eller hent pakkevalg.\n"
 "Formatet er det samme som for auto_install-genererte filer."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Last inn"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Lagre"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Ødelagt fil"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Skrivebordsvalg"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 "Her kan du velge skrivebordsprofilen for systemet: KDE, GNOME eller "
 "skreddersydd"
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valgt størrelse er større enn tilgjengelig plass"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Type installasjon"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1265,82 +1225,82 @@ msgstr ""
 "Du har ikke valgt noen pakkegrupper.\n"
 "Velg den minimale installasjonen du ønsker:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Med X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med grunnleggende dokumentasjon (anbefalt!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Virkelig minimal installasjon (uten urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Det var en feil ved endring av pakkenes rekkefølge:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Fortsett uansett?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Hopp over denne pakken"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Hopp over alle pakker fra media \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Gå tilbake til valg av media og pakker"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Feil under installering av pakke %s"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Oppsett etter installering"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Vennligst forsikre deg om at medie med oppdaterte moduler er i %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Oppdateringer"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1352,34 +1312,35 @@ msgid ""
 "\n"
 "Do you want to install the updates?"
 msgstr ""
-"Du har nå muligheten til å laste ned oppdaterte pakker. Dette er pakker som har blitt sluppet etter at distribusjonen ble lansert. Dette kan være enten sikkerhetsoppdateringer eller feilrettelser."
-"\n"
+"Du har nå muligheten til å laste ned oppdaterte pakker. Dette er pakker som "
+"har blitt sluppet etter at distribusjonen ble lansert. Dette kan være enten "
+"sikkerhetsoppdateringer eller feilrettelser.\n"
 "For å laste ned disse pakkene må du ha en fungerende Internettoppkobling.\n"
 "\n"
 "Ønsker du å installere oppdateringene?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du et ISA-lydkort?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1388,69 +1349,69 @@ msgstr ""
 "Kjør «alsaconf» eller «sndconfig» etter installasjonen for å sette opp "
 "lydkortet ditt"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Lydkort ikke oppdaget. Prøv \"harddrake\" etter installasjonen"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafisk grensesnitt"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Nettverk & internett"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Mellomtjenere"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "satt opp"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Sikkerhetsnivå"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktivert"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "deaktiver"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Du har ikke satt opp det grafiske grensesnittet Xorg. Er du sikker på at du "
 "ikke vil gjøre dette?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Klargjør oppstartslaster..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Vennligst vær tålmodig, dette kan ta en stund..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1463,7 +1424,7 @@ msgstr ""
 "du må bruke BootX eller andre måter for å starte din maskin. "
 "Kjerneargumentet for root-filsystemet er: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1472,17 +1433,17 @@ msgstr ""
 "I dette sikkerhetsnivået er tilgang til Windows-partisjonen forbeholdt "
 "administratoren."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sett inn en tom diskett i stasjon %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Oppretter diskett for autoinstallasjon..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1493,7 +1454,7 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å avslutte nå?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulerer"
@@ -1637,4 +1598,28 @@ msgid ""
 "Exit"
 msgstr "Avslutt"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Ditt skrivebord på en USB-penn"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Den hundre prosent åpen kildekode-distribusjonen, Mandriva Linux"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Utforsk lett Linux med Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Et komplett Mandriva Linux-skrivebord"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distribusjonen for alles behov"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Laster ned fil %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Oppgradering fra en 32-bit til en 64-bit distribusjon er ikke støttet"
 
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Oppgradering fra en 64-bit til en 32-bit distribusjon er ikke støttet"
diff --git a/perl-install/install/share/po/nl.po b/perl-install/install/share/po/nl.po
index 1c721c3f3..6eff0892e 100644
--- a/perl-install/install/share/po/nl.po
+++ b/perl-install/install/share/po/nl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-04-05 20:05+0200\n"
 "Last-Translator: Reinout van Schouwen <reinout@gmail.com>\n"
 "Language-Team: Nederlands\n"
@@ -21,31 +21,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Uw bureaublad op een USB-stick"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "De 100%% opensource Mandriva Linux-distributie"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Gemakkelijk Linux verkennen met Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Een volledig Mandriva Linux-bureaublad, met ondersteuning"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva-distributies: voor elk wat wils"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -86,17 +61,17 @@ msgstr "Netwerk (FTP)"
 msgid "Network (NFS)"
 msgstr "Netwerk (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL van de mirror?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL dient te starten met ftp:// of http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -104,7 +79,7 @@ msgstr ""
 "Bezig te verbinden met de Mandriva Linux-website om de lijst met beschikbare "
 "mirrors op te halen…"
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -113,47 +88,47 @@ msgstr ""
 "Het verbinden met de Mandriva Linux-website om de lijst met beschikbare "
 "mirrors op te halen is mislukt"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Kies een mirror om de pakketten van af te halen"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-configuratie"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Vul de hostnaam en map van uw NFS media in"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Hostnaam ontbreekt"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Map dient te beginnen met \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Hostnaam van het NFS-koppelpunt?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Map"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Aanvullend"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -162,22 +137,22 @@ msgstr ""
 "Kan hdlist-bestand op deze mirror niet vinden. Controleer of de locatie "
 "klopt."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Inventarisatie van reeds geïnstalleerde pakketten…"
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Zoeken naar pakketten om op te waarderen…"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Verwijderen van pakketten vóór opwaardering..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -198,18 +173,18 @@ msgstr ""
 "gelieve uw systeem te herstarten en op te waarderen met behulp van het "
 "Mandriva-herzieningenapplet."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Herstarten"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Doorgaan"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -223,72 +198,72 @@ msgstr ""
 "\n"
 "Weet u zeker dat u deze pakketten wilt verwijderen?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fout bij het lezen van bestand %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "De volgende schijf/schijven zijn hernoemd:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (heette voorheen %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Netwerk"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Kies een medium"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Bestand bestaat reeds. Overschrijven?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Toegang geweigerd"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Slechte NFS naam"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Ongeldig medium %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Kan geen schermafdruk maken voor het partitioneren"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Schermafdrukken zullen beschikbaar zijn na installatie in %s"
@@ -299,11 +274,15 @@ msgid "Installation"
 msgstr "Installatie"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Configuratie"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -328,22 +307,22 @@ msgstr "Bezig met opstarten van het netwerk"
 msgid "Bringing down the network"
 msgstr "Bezig met stoppen van het netwerk"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Even geduld, bestand wordt opgehaald"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Bestand %s wordt gedownload…"
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiëren van enkele pakketten op diskettes voor toekomstig gebruik"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Bezig met kopiëren"
@@ -387,27 +366,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Er is een fout opgetreden:"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d installatie-transacties mislukt"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installatie van pakketten mislukt:"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Werkstation"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Kantooromgeving"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -416,7 +395,7 @@ msgstr ""
 "Kantoorprogramma's: tekstverwerkers (OpenOffice.org Writer, Kword), "
 "rekenbladen (OpenOffice.org Calc, Kspread), PDF-lezers, etc"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -425,32 +404,32 @@ msgstr ""
 "Kantoorprogramma's: tekstverwerkers (kword, abiword), rekenbladen (kspread, "
 "gnumeric), PDF-lezers, etc"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Game-station"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Amusementsprogramma's: arcade, bordspellen, strategie etc"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedia-station"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Geluids- en video-afspeel- en bewerkingsprogramma's"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internet-station"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -459,211 +438,193 @@ msgstr ""
 "Verzameling programma's om e-mail en usenet nieuws mee te lezen en te "
 "schrijven, en om het Web mee door te bladeren"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Netwerk-computer (client)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients voor verschillende protcollen waaronder ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Programma's om de configuratie van uw computer te vergemakkelijken"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Hulpprogramma's voor de opdrachtregel"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editors, shells, bestandsbeheer, terminals"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Ontwikkeling"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C and C++ ontwikkelingsbibliotheken, programma's en include-bestanden"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Documentatie"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Boeken en Howto's over Linux en Vrije Software"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standaard-Basis. Ondersteuning voor toepassingen van derden."
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Webserver"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab-server"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Firewall/Router"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet gateway"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "E-mail/nieuws"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix e-mailserver, Inn newsserver"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Gidsserver"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-server"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domeinnaam- en Network Information Server"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Gedeelde bestands- en printerserver"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS-server, Samba-server"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL en MySQL database-server"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "E-mail"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix e-mailserver"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL of MySQL database-server"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Netwerk-computer server"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS server, SMB server, Proxy server, ssh server"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafische omgeving"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-werkomgeving"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -672,12 +633,12 @@ msgstr ""
 "Het K Desktop Environment, de basis-grafische omgeving met een verzameling "
 "van bijbehorende programma's"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-werkomgeving"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -686,7 +647,7 @@ msgstr ""
 "Een grafische omgeving met gebruikersvriendelijke verzameling toepassingen "
 "en bureaublad-programma's"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE-werkomgeving"
@@ -697,57 +658,55 @@ msgid ""
 "A lightweight & fast graphical environment with user-friendly set of "
 "applications and desktop tools"
 msgstr ""
-"Een lichtgewicht- en snelle grafische omgeving met gebruiksvriendelijke set toepassingen "
-"en bureaublad-programma's"
+"Een lichtgewicht- en snelle grafische omgeving met gebruiksvriendelijke set "
+"toepassingen en bureaublad-programma's"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andere grafische omgevingen"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Hulpprogramma's"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-server"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin-server voor configuratie op afstand"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Netwerk-hulpprogramma's/observatie"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Observatieprogramma's, bijhouden van processen, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva-wizards"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Wizards om server te configureren"
@@ -847,17 +806,17 @@ msgstr "Hier is een voorproefje van de '%s'-werkomgeving."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klik op het beeld voor een grotere versie"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakketgroepselectie"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuele pakketselectie"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Totale grootte: %d / %d MB"
@@ -977,12 +936,12 @@ msgstr "Minimale installatie"
 msgid "Software Management"
 msgstr "Softwarebeheer"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Kies de pakketten die u wenst te installeren"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installeren"
@@ -1009,7 +968,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pakket"
 msgstr[1] "%d pakketten"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Overzicht"
@@ -1019,7 +978,7 @@ msgstr "Overzicht"
 msgid "Configure"
 msgstr "Configureren"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "niet geconfigureerd"
@@ -1029,7 +988,7 @@ msgstr "niet geconfigureerd"
 msgid "Media Selection"
 msgstr "Mediaselectie"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1038,7 +997,7 @@ msgstr ""
 "De volgende installatiemedia zijn gevonden.\n"
 "Indien u sommige wilt overslaan, kunt u ze nu deselecteren."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1051,7 +1010,7 @@ msgstr ""
 "De installatie gaat dan door vanaf de harde schijf en de pakketten blijven "
 "beschikbaar zodra het systeem volledig geïnstalleerd is."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Hele cd's kopiëren"
@@ -1071,61 +1030,49 @@ msgstr "Kies uw toetsenbord-indeling"
 msgid "Here is the full list of available keyboards:"
 msgstr "Dit is de volledige lijst van beschikbare toetsenborden:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installatie/Opwaardering"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Wilt u opwaarderen of een nieuwe installatie uitvoeren?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installatie"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s opwaarderen"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"Opwaarderen van een 32-bit naar een 64-bit-distributie wordt niet ondersteund"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"Opwaarderen van een 64-bit naar een 32-bit-distributie wordt niet ondersteund"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Vercijferingssleutel voor %s"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Installatie afbreken, systeem herstarten"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Nieuwe installatie"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Bestaande installatie opwaarderen (niet aanbevolen)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1146,17 +1093,17 @@ msgstr ""
 "alvorens\n"
 "\"Nieuwe installatie\" te kiezen."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE-Configuratie"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1166,7 +1113,7 @@ msgstr ""
 "doorgaan, maar om uw systeem op te starten zult u de bootstrap partitie in "
 "DiskDrake moeten creëren."
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1177,7 +1124,7 @@ msgstr ""
 "gaan, maar om uw systeem op te starten zult u de bootstrappartitie in "
 "DiskDrake moeten creëren."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1192,12 +1139,12 @@ msgstr ""
 "Als u deze CD niet heeft, klik dan Annuleren om verdere installatie vanaf "
 "deze CD te vermijden."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Bezig met zoeken naar beschikbare pakketten"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1206,7 +1153,7 @@ msgstr ""
 "Uw systeem heeft niet genoeg ruimte over voor installatie of opwaardering (%"
 "dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1215,52 +1162,52 @@ msgstr ""
 "U kunt kiezen of u de pakketselectie wilt laden of opslaan.\n"
 "Het formaat is dezelfde als de met auto_install gegenereerde bestanden."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Laden"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Opslaan"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Ongeldig bestand"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "Gnome"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Werkomgevingselectie"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "U kunt de grafische omgeving voor uw werkstation kiezen."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "De geselecteerde grootte is meer dan de beschikbare ruimte"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Type installatie"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1269,82 +1216,82 @@ msgstr ""
 "U heeft geen enkele pakketgroep geselecteerd\n"
 "Gelieve de minimale installatie die u wenst te kiezen."
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Met X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Met basis-documentatie (aanbevolen!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Werkelijk minimale installatie (in het bijzonder geen urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Bezig met voorbereiden van installatie"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Bezig met installeren van pakket %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Er is een fout opgetreden bij het sorteren van de pakketten:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Toch verdergaan?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Opnieuw proberen"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Dit pakket overslaan"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Alle pakketten van medium ‘%s’ overslaan"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Terug naar media- en pakketselectie"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Er is een fout opgetreden bij het installeren van pakket %s."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuratie na installatiestap"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Zorg ervoor dat de Update Modules-media zich in station %s bevindt"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Updates"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1364,28 +1311,28 @@ msgstr ""
 "\n"
 "Wenst u de bijgewerkte pakketten te installeren?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s op %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Apparatuur"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Geluidskaart"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Heeft u een ISA geluidskaart?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1394,67 +1341,67 @@ msgstr ""
 "Voer \"alsaconf\" of \"sndconfig\" na de installatie uit om uw geluidskaart "
 "te configureren"
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Geen geluidskaart bespeurd. Probeer \"harddrake\" na de installatie"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafische interface"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Netwerk & internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Proxy's"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "geconfigureerd"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Beveiligingsniveau"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "geactiveerd"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "uitgeschakeld"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "U heeft X niet geconfigureerd. Weet u zeker dat u dit wilt?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Klaarmaken van opstartlader…"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Een moment geduld, dit kan even duren…"
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1468,7 +1415,7 @@ msgstr ""
 "starten. Het argument om aan de kernel mee te geven voor het root-"
 "bestandssysteem is: root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1477,17 +1424,17 @@ msgstr ""
 "In dit beveiligingsniveau wordt toegang tot de bestanden op de Windows-"
 "partitie voorbehouden aan de systeembeheerder."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Plaats een lege diskette in station %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Aanmaken van auto-installatiediskette…"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1498,7 +1445,7 @@ msgstr ""
 "\n"
 "Weet u zeker dat u op dit moment wilt afsluiten?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Gefeliciteerd"
@@ -1642,6 +1589,34 @@ msgid ""
 "Exit"
 msgstr "Afsluiten"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Uw bureaublad op een USB-stick"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "De 100%% opensource Mandriva Linux-distributie"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Gemakkelijk Linux verkennen met Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Een volledig Mandriva Linux-bureaublad, met ondersteuning"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva-distributies: voor elk wat wils"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Bestand %s wordt gedownload…"
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Opwaarderen van een 32-bit naar een 64-bit-distributie wordt niet "
+#~ "ondersteund"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Opwaarderen van een 64-bit naar een 32-bit-distributie wordt niet "
+#~ "ondersteund"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/nn.po b/perl-install/install/share/po/nn.po
index ec5256d7a..5d00d575c 100644
--- a/perl-install/install/share/po/nn.po
+++ b/perl-install/install/share/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-04-05 23:37+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -17,31 +17,6 @@ msgstr ""
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Skrivebordet på ein minnepinne"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Mandriva Linux-distribusjonen med 100 %% open kjeldekode"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Utforsk Linux med Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Eit fullt Mandriva Linux-skrivebord – med brukarstøtte"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: Distribusjonar for alle behov"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -81,23 +56,23 @@ msgstr "Nettverk (FTP)"
 msgid "Network (NFS)"
 msgstr "Nettverk (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Adresse til spegelen?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Adresser må starta med «ftp://» eller «http://»."
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "Kontaktar Mandriva Linux-nettstaden for oversikt over speglar …"
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -106,47 +81,47 @@ msgstr ""
 "Klarte ikkje få kontakt med Mandriva Linux-nettstaden for å henta oversikt "
 "over tilgjengelege speglar."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Vel spegelen du vil installera pakkar frå"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-oppsett"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Skriv inn vertsnamn og mappe til NFD-media"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Manglar vertsnam"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Mappa må begynna med «/»"
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Vertsnamn til NFS-montering:"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Katalog"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Tillegg"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -154,22 +129,22 @@ msgid ""
 msgstr ""
 "Finn ikkje pakkelistfila på denne spegelen. Sjå til at adressa er rett."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ser på allereie installerte pakkar …"
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Ser etter pakkar å oppgradera …"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Fjernar pakkar for oppgradering …"
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -188,18 +163,18 @@ msgstr ""
 "må du starta maskina på nytt, og så oppgradera med Mandriva-"
 "oppdateringsprogrammet som du finn i systemtrauet."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Start på nytt"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Hald fram"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -212,72 +187,72 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil fjerna pakkane?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Klarte ikkje lesa fila «%s»"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Desse diskane fekk nye namn:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "«%s» (tidlegare namn: «%s»)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Nettverk"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Vel medium"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fila finst allereie. Vil du skriva over ho?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Nekta løyve"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Ugyldig NFS-namn"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Ugyldig medium: %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Kan ikkje ta skjermbilete før partisjonering"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjermbilete vert tilgjengelege i «%s» etter installeringa er ferdig"
@@ -288,11 +263,15 @@ msgid "Installation"
 msgstr "Installering"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Oppsett"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -317,22 +296,22 @@ msgstr "Koplar til nettverket"
 msgid "Bringing down the network"
 msgstr "Koplar frå nettverket"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Hentar fil. Vent litt …"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Lastar ned «%s» …"
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopierer nokre pakkar til harddisken for seinare bruk"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopierer filer"
@@ -376,27 +355,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Det oppstod ein feil:"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "feil med %d installasjonstransaksjonar"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Feil ved installering av pakkar:"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Arbeidstasjon"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Kontormaskin"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -405,7 +384,7 @@ msgstr ""
 "Kontorprogramvare: Teksthandsamarar (OpenOffice.org Writer, Kword), rekneark "
 "(OpenOffice.org Calc, Kspread), PDF-viseprogram, med meir"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -414,32 +393,32 @@ msgstr ""
 "Kontorprogramvare: Teksthandsamarar (KWord, AbiWord), rekneark (KSpread, "
 "gnumeric), PDF-viseprogram, med meir"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Spelmaskin"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Moroprogram: Arkadespel, brettspel, strategispel, med meir"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediemaskin"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Program for vising og redigering av film"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internett-maskin"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -448,223 +427,205 @@ msgstr ""
 "Program for lesing og sending av e-post, deltaking i temagrupper og surfing "
 "på Internett"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Nettverksmaskin (klient)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klientprogramvare for fleire protokollar, som ssh"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Verktøy for enkelt oppsett av datamaskina"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsollverktøy"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Skriveprogram, skal, filverktøy og terminalprogram."
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Utvikling"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C og C++-utviklingsbibliotek, program og inkluderingsfiler"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Hjelpetekst"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Bøker og hjelpeoppskrifter for Linux og fri programvare"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base – støtte for tredjepartsprogram"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Vevtenar"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Gruppevare"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab-tenar"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Brannmur/rutar"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internett-portnar"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "E-post og temagrupper"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix e-posttenar og Inn temagruppetenar"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Katalogtenar"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-tenar"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domenenamn og nettverksinformasjonstenar."
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fil- og skrivardeling-tenar"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS-tenar, Samba-tenar"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL- og MySQL-databasetenar"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Vev/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "E-post"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix-e-posttenar"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL- eller MySQL-databasetenar"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Nettverkstenar"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-tenar, SMB-tenar, mellomtenar, ssh-tenar"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafisk miljø"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "Skrivebordsmiljøet KDE, med ei samling tilhøyrande verktøy"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -672,7 +633,7 @@ msgid ""
 msgstr ""
 "Eit grafisk skrivebordsmiljø med brukarvenlege program og skrivebordsverktøy"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE-skrivebord"
@@ -686,54 +647,52 @@ msgstr ""
 "Eit kjapt og lite ressurskrevande grafisk skrivebordsmiljø med brukarvenlege "
 "program og skrivebordsverktøy"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andre grafiske skrivebord"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, med fleire"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Verktøy"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-tenar"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin-fjernoppsettenar"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Nettverksverktøy og -overvaking"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Overvakingsverktøy, prosesshandsaming, tcpdump, nmap, med meir"
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva-vegvisarar"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Vegvisarar for tenaroppsett"
@@ -831,17 +790,17 @@ msgstr "Slik ser skrivebordsmiljøet %s ut."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Trykk på bileta for å forstørra dei"
 
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakkegruppeval"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Direkte pakkeval"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Totalstorleik: %d / %d MiB"
@@ -960,12 +919,12 @@ msgstr "Minimal installering"
 msgid "Software Management"
 msgstr "Programvarehandsaming"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Vel pakkane du ønskjer å installera"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installerer"
@@ -992,7 +951,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pakke"
 msgstr[1] "%d pakkar"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Samandrag"
@@ -1002,7 +961,7 @@ msgstr "Samandrag"
 msgid "Configure"
 msgstr "Set opp"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "ikkje sett opp"
@@ -1012,7 +971,7 @@ msgstr "ikkje sett opp"
 msgid "Media Selection"
 msgstr "Medieval"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1021,7 +980,7 @@ msgstr ""
 "Fann desse installasjonsmedia.\n"
 "Om du ikkje ønskjer å bruka alle, kan du velja vekk dei du ikkje treng no."
 
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1034,7 +993,7 @@ msgstr ""
 "Installasjonen vil då helda fram frå harddisken, og pakkane vil vera lett "
 "tilgjengeleg òg etter at systemet er installert og sett opp."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopier CD-ane"
@@ -1054,59 +1013,49 @@ msgstr "Vel tastaturoppsett"
 msgid "Here is the full list of available keyboards:"
 msgstr "Her er heile lista over tastaturoppsett:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installer/oppgrader"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Vil du installera eller oppgradera?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installer"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Oppgrader «%s»"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Oppgradering frå 32 bits til 64 bits er ikkje støtta"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Oppgradering frå 64 bits til 32 bits er ikkje støtta"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Krypteringsnøkkel for «%s»"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Avbryt installering og start systemet på nytt"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Nyinstallering"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Oppgrader førre installasjon (ikkje tilrådd)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1125,17 +1074,17 @@ msgstr ""
 "Åtvaring: Du bør ta reservekopi av alle personlege data før du vel "
 "«Nyinstallering»."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "Set opp IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1144,7 +1093,7 @@ msgstr ""
 "Ikkje nok ledig plass for oppstartslastar på 1 MiB. Installasjonen held "
 "fram, men du må sjølv laga ein oppstartslastarpartisjon i DiskDrake."
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1155,7 +1104,7 @@ msgstr ""
 "viss du vil starta systemet, må du først laga bootstrap-partisjonen i "
 "DiskDrake."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1168,12 +1117,12 @@ msgstr ""
 "Set inn plata merkt «%s» og trykk «OK».\n"
 "Trykk eventuelt «Avbryt» om du ikkje har denne plata."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Ser etter tilgjengelege pakkar …"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1182,7 +1131,7 @@ msgstr ""
 "Maskina di har ikkje nok ledig plass for installering eller oppgradering (%d "
 "MB > %d MB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1191,52 +1140,52 @@ msgstr ""
 "Vel å lagra eller henta pakkeval.\n"
 "Formatet er likt det laga av «auto_install»."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Last"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Lagra"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Ugyldig fil"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Skrivebordsval"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Du kan velja skrivebordsmiljø."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valt storleik er større enn tilgjengeleg plass"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Installasjonstype"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1245,82 +1194,82 @@ msgstr ""
 "Du har ikkje valt noko pakkegruppe.\n"
 "Vel kva type minimal installasjon du vil ha:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Med X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med grunnleggjande hjelpetekstar (tilrådd)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Heilt minimal (òg utan urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Førebur installasjon"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakken «%s»"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Det oppstod ein feil ved sortering av pakkar:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Vil du helda fram likevel?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Prøv på nytt"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Hopp over denne pakken"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Hopp over alle pakkar frå mediet «%s»"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Gå tilbake til medie- og pakkevalskjermen"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Det oppstod ein feil ved installering av pakken «%s»."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Oppsett etter installering"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Sjå til at oppdateringsmediet er i stasjon %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Oppdateringar"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1343,28 +1292,28 @@ msgstr ""
 "\n"
 "Ønskjer du å installera oppdateringane?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du eit ISA-lydkort?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1372,69 +1321,69 @@ msgid ""
 msgstr ""
 "Køyr «sndconfig» etter installasjonen er ferdig for å setja opp lydkortet."
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Fann ingen lydkort. Køyr «harddrake» etter installasjonen er ferdig."
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafisk grensesnitt"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Nettverk og Internett"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Mellomtenarar"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "oppsett"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Tryggleiksnivå"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "påslått"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "avslått"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Du har ikkje sett opp det grafiske grensesnittet. Er du sikker på at du "
 "ikkje vil ha det?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Førebur oppstartslastar …"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Ver tålmodig. Dette kan ta ei stund …"
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1447,7 +1396,7 @@ msgstr ""
 "annan måte å starta maskina di på. Kjerneargumentet for rotfilsystemet er: "
 "root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1456,17 +1405,17 @@ msgstr ""
 "Med dette tryggleiksnivået er det berre administratoren som får tilgang til "
 "filer på Windows-partisjonen."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Set inn ein tom diskett i stasjon «%s»"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Lagar diskett for automatisk installasjon …"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1477,7 +1426,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil avslutta?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulerer"
@@ -1621,6 +1570,30 @@ msgid ""
 "Exit"
 msgstr "Avslutt"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Skrivebordet på ein minnepinne"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Mandriva Linux-distribusjonen med 100 %% open kjeldekode"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Utforsk Linux med Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Eit fullt Mandriva Linux-skrivebord – med brukarstøtte"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: Distribusjonar for alle behov"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Lastar ned «%s» …"
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Oppgradering frå 32 bits til 64 bits er ikkje støtta"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Oppgradering frå 64 bits til 32 bits er ikkje støtta"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"
diff --git a/perl-install/install/share/po/pa_IN.po b/perl-install/install/share/po/pa_IN.po
index ab49e38a5..d9cb984a3 100644
--- a/perl-install/install/share/po/pa_IN.po
+++ b/perl-install/install/share/po/pa_IN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2005-03-27 17:55+0530\n"
 "Last-Translator: Jaswinder Singh Phulewala <jaswinderphulewala@yahoo.com>\n"
 "Language-Team: Punjabi <punlinux-i18n@lists.soruceforge.net>\n"
@@ -18,31 +18,6 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -78,92 +53,92 @@ msgstr "ਨੈੱਟਵਰਕ (FTP)"
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "ਪ੍ਰਤਿਬਿੰਬ ਦਾ URL?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "ਉਪਲੱਬਧ ਪ੍ਰਤੀਬਿੰਬਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਲਈ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਵੈਬ ਸਾਈਟ ਨਾਲ ਸੰਪਰਕ ਜਾਰੀ ਹੈ..."
 
-#: any.pm:185
+#: any.pm:187
 #, fuzzy, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
 "mirrors"
 msgstr "ਉਪਲੱਬਧ ਪ੍ਰਤੀਬਿੰਬਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਲਈ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਵੈਬ ਸਾਈਟ ਨਾਲ ਸੰਪਰਕ ਜਾਰੀ ਹੈ..."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "ਪੈਕੇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਪ੍ਰਤੀਬਿੰਬ ਚੁਣੋ"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "ਡਾਇਰੈਕਟਰੀ"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "ਇਸ ਪ੍ਰਤੀਬਿੰਬ ਤੇ ਪੈਕੇਜ ਸੂਚੀ ਫਾਇਲ ਨਹੀਂ ਲੱਭ ਸਕੀ। ਜਾਂਚ ਕਰੋ ਕਿ ਸਥਿਤੀ ਠੀਕ ਹੈ।"
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "ਪਹਿਲਾਂ ਇੰਸਟਾਲ ਕੀਤੇ ਪੈਕੇਜਾਂ ਸੀ ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "ਨਵੀਨੀਕਰਨ ਲਈ ਪੈਕੇਜਾਂ ਦੀ ਖੋਜ..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr ""
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -175,18 +150,18 @@ msgid ""
 "please reboot your system and upgrade using the Mandriva update applet."
 msgstr ""
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "ਮੁੜ-ਚਾਲੂ"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -199,72 +174,72 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਇਹ ਪੈਕੇਜ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "ਫਾਇਲ %s ਪੜਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "ਹੇਠਲੀਆਂ ਡਿਸਕਾਂ ਦੇ ਨਾਂ ਤਬਦੀਲ ਕੀਤੇ ਹਨ:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (ਪਹਿਲਾਂ %s ਨਾਂ ਸੀ)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1081
+#: any.pm:1087
 #, fuzzy, c-format
 msgid "FTP"
 msgstr "ਵੈਬ/FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "PFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "ਨੈੱਟਵਰਕ"
 
-#: any.pm:1104
+#: any.pm:1110
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਬੈਕਅੱਪ ਲਈ ਮਾਧਿਅਮ ਚੁਣੋ।"
 
-#: any.pm:1120
+#: any.pm:1126
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "ਫਾਇਲ ਪਹਿਲਾਂ ਮੌਜੂਦ ਹੈ, ਇਹ ਵਰਤੋ?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, fuzzy, c-format
 msgid "Permission denied"
 msgstr "ਅਧਿਕਾਰ"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr ""
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "ਵਿਭਾਗੀਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਰਦਾ-ਤਸਵੀਰ ਨਹੀਂ ਬਣਾ ਸਕਦਾ"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "ਪਰਦਾ-ਤਸਵੀਰਾਂ %s ਵਿੱਚ ਇੰਸਟਾਲੇਸ਼ਨ ਤੋਂ ਬਾਅਦ ਉਪਲੱਬਧ ਹੋਣਗੀਆਂ"
@@ -275,11 +250,15 @@ msgid "Installation"
 msgstr "ਇੰਸਟਾਲ ਹੋ ਰਹੇ ਹਨ"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "ਸੰਰਚਨਾ"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -304,22 +283,22 @@ msgstr "ਨੈੱਟਵਰਕ ਚਲਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgid "Bringing down the network"
 msgstr "ਨੈੱਟਵਰਕ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "ਫਾਇਲਾਂ ਭੇਜ ਰਿਹਾ ਹੈ..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "ਨਕਲ ਜਾਰੀ ਹੈ"
@@ -361,27 +340,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "%s ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੋ ਰਹੀ ਹੈ"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "ਵਰਕਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "ਦਫਤਰ ਵਰਕਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -390,7 +369,7 @@ msgstr ""
 "ਦਫਤਰੀ ਪ੍ਰੋਗਰਾਮ: ਅੱਖਰਕਾਰ (OpenOffice.org Writer, Kword), ਸਾਰਣੀਕਾਰ (OpenOffice."
 "org Calc, Kspread), PDF ਦਰਸ਼ਕ, ਆਦਿ"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -399,262 +378,244 @@ msgstr ""
 "ਦਫਤਰੀ ਪ੍ਰੋਗਰਾਮ: ਅੱਖਰਕਾਰ (kword, abiword), ਸਾਰਣੀਕਾਰ (kspread, gnumeric), pdf "
 "ਦਰਸ਼ਕ, ਆਦਿ"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "ਖੇਡ ਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "ਮਨੋਰੰਜਨ ਪ੍ਰੋਗਰਾਮ: ਆਰਕੇਡ, ਬੋਰਡ, ਨੀਤੀ, ਆਦਿ"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "ਮਲਟੀਮੀਡੀਆ ਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "ਸਾਊਂਡ ਅਤੇ ਵੀਡੀਓ ਚਲਾਉਣ/ਸੋਧਣ ਵਾਲੇ ਪ੍ਰੋਗਰਾਮ"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "ਇੰਟਰਨੈੱਟ ਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "ਪੱਤਰ ਅਤੇ ਖਬਰਾਂ ਪੜਨ ਅਤੇ ਭੇਜਣ ਲਈ (mutt, tin..) ਅਤੇ ਵੈਬ ਝਾਤੀ ਲਈ ਸੰਦਾਂ ਦਾ ਸਮੂਹ"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "ਨੈੱਟਵਰਕ ਕੰਪਿਊਟਰ (ਕਲਾਂਈਟ)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "ssh ਸਮੇਤ ਵੱਖ-ਵੱਖ ਪਰੋਟੋਕਾਲਾਂ ਲਈ ਕਲਾਂਈਟ"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਦੀ ਸੰਰਚਨਾ ਸਾਫ ਕਰਨ ਲਈ ਸੰਦ"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "ਕੰਸੋਲ ਸੰਦ"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "ਸੰਪਾਦਕ, ਸ਼ੈੱਲ, ਫਾਇਲ ਸੰਦ, ਟਰਮੀਨਲ"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "ਵਿਕਾਸ"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C ਅਤੇ C++ ਵਿਕਾਸ ਲਾਇਬ੍ਰੇਰੀਆਂ, ਪ੍ਰੋਗਰਾਮ ਅਤੇ ਸ਼ਾਮਿਲ ਫਾਇਲਾਂ"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "ਦਸਤਾਵੇਜ਼"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "ਲੀਨਕਸ ਅਤੇ ਮੁਕਤ ਸਾਫਟਵੇਅਰ ਉੱਪਰ ਕਿਤਾਬਾਂ ਅਤੇ Howto's"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "ਲੀਨਕਸ ਮਿਆਰੀ ਮੁੱਢ। ਤੀਜੀ ਪਾਰਟੀ ਕਾਰਜ ਸਹਿਯੋਗ"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "ਵੈਬ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "ਗਰੁੱਪਵੇਅਰ"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab ਸਰਵਰ"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "ਫਾਇਲਵਾਲ/ਰਾਊਟਰ"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "ਇੰਟਰਨੈੱਟ ਗੇਟਵੇ"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "ਪੱਤਰ/ਖਬਰ"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix ਪੱਤਰ ਸਰਵਰ, Inn ਖਬਰ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "ਡੋਮੇਨ ਨਾਂ ਅਤੇ ਨੈੱਟਵਰਕ ਜਾਣਕਾਰੀ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "ਫਾਇਲ ਅਤੇ ਪ੍ਰਿੰਟਰ ਸ਼ੇਅਰਿੰਗ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS ਸਰਵਰ, ਸਾਂਬਾ ਸਰਵਰ"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "ਡਾਟਾਬੇਸ "
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL ਅਤੇ MySQL ਡਾਟਾਬੇਸ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "ਵੈਬ/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix ਪੱਤਰ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL ਜਾਂ MySQL ਡਾਟਾਬੇਸ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "ਨੈੱਟਵਰਕ ਕੰਪਿਊਟਰ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS ਸਰਵਰ, SMB ਸਰਵਰ, ਪਰਾਕਸੀ ਸਰਵਰ, ssh ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "ਕੇ ਡੀ ਈ ਵਰਕਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "ਕੇ ਵਿਹੜਾ ਵਾਤਾਵਰਨ, ਸਾਥੀ ਸੰਦਾਂ ਦੇ ਭੰਡਾਰ ਨਾਲ ਮੁੱਢਲਾ ਗਰਾਫਿਕਲ ਵਾਤਾਵਰਨ"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "ਗਨੋਮ ਵਰਕਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "ਉਪਭੋਗੀ-ਅਨੁਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "ਵਿਹੜਾ"
@@ -666,54 +627,52 @@ msgid ""
 "applications and desktop tools"
 msgstr "ਉਪਭੋਗੀ-ਅਨੁਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "ਹੋਰ ਗਰਾਫੀਕਲ ਵਿਹੜੇ"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, fuzzy, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ਆਦਿ"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "ਸਹੂਲਤਾਂ"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"