update pot (#46606)

1 files changed, 259 insertions, 247 deletions

diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po
index 777aa3082..4d07156cd 100644
--- a/perl-install/install/share/po/zh_CN.po
+++ b/perl-install/install/share/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 2008 Spring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 20:13+0200\n"
+"POT-Creation-Date: 2009-01-01 19:22+0100\n"
 "PO-Revision-Date: 2008-03-22 13:46+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -17,6 +17,31 @@ 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 "U 盘上的桌面"
+
+#: ../../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 轻松探索 Linux"
+
+#: ../../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?"
@@ -141,8 +166,37 @@ msgstr "正在删除由于更新所致的软件包..."
 msgid "Finding packages to upgrade..."
 msgstr "正在寻找可升级的程序..."
 
+#: any.pm:389
+#, 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"
+"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 in an upgrade。如果您选择继续的话，KDE 4 将会替"
+"换\n"
+"KDE 3，而您关于 KDE 配置的设置也将丢失。\n"
+"要仍然升级但却保留 KDE 3.5，并且保留您的个人设置，请重新启动您的系统，然后"
+"使\n"
+"用 Mandriva 更新小程序升级。"
+
+#: any.pm:394 steps_interactive.pm:1126
+#, c-format
+msgid "Reboot"
+msgstr "重新启动"
+
+#: any.pm:394
+#, c-format
+msgid "Proceed"
+msgstr ""
+
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:564
+#: any.pm:584
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -165,7 +219,7 @@ msgstr ""
 "您真要安装这些服务器吗?\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:587
+#: any.pm:607
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -178,82 +232,82 @@ msgstr ""
 "\n"
 "您确定要删除这些软件包吗?\n"
 
-#: any.pm:801
+#: any.pm:826
 #, c-format
 msgid "Error reading file %s"
 msgstr "请取文件 %s 出错"
 
-#: any.pm:1008
+#: any.pm:1033
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "下列盘片已重命名:"
 
-#: any.pm:1010
+#: any.pm:1035
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s(以前的名称为 %s)"
 
-#: any.pm:1067
+#: any.pm:1092
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1067
+#: any.pm:1092
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1067
+#: any.pm:1092
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1086 steps_interactive.pm:972
+#: any.pm:1111 steps_interactive.pm:955
 #, c-format
 msgid "Network"
 msgstr "网络"
 
-#: any.pm:1090
+#: any.pm:1115
 #, c-format
 msgid "Please choose a media"
 msgstr "请选择介质"
 
-#: any.pm:1106
+#: any.pm:1131
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "文件已经存在。覆盖吗?"
 
-#: any.pm:1110
+#: any.pm:1135
 #, c-format
 msgid "Permission denied"
 msgstr "没有权限"
 
-#: any.pm:1158
+#: any.pm:1183
 #, c-format
 msgid "Bad NFS name"
 msgstr "无效的 NFS 名称"
 
-#: any.pm:1179
+#: any.pm:1204
 #, c-format
 msgid "Bad media %s"
 msgstr "无效的介质 %s"
 
-#: any.pm:1222
+#: any.pm:1247
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "无法在分区完成之前进行屏幕捕捉"
 
-#: any.pm:1230
+#: any.pm:1255
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "安装完成后, 所有的屏幕抓图都会保存到 %s 之中"
 
-#: gtk.pm:126
+#: gtk.pm:130
 #, c-format
 msgid "Installation"
 msgstr "安装"
 
-#: gtk.pm:130 share/meta-task/compssUsers.pl:42
+#: gtk.pm:134 share/meta-task/compssUsers.pl:44
 #, c-format
 msgid "Configuration"
 msgstr "配置"
@@ -287,17 +341,17 @@ msgstr "正在禁用网络"
 msgid "Please wait, retrieving file"
 msgstr "请稍候，正在获取文件"
 
-#: media.pm:703 media.pm:714
+#: media.pm:705 media.pm:716
 #, c-format
 msgid "Downloading file %s..."
 msgstr "正在下载文件 %s..."
 
-#: media.pm:806
+#: media.pm:808
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "正在将软件包复制到磁盘中以备后用"
 
-#: media.pm:859
+#: media.pm:861
 #, c-format
 msgid "Copying in progress"
 msgstr "复制进行中"
@@ -336,17 +390,17 @@ msgstr ""
 "%s 所请求的某些软件包无法安装:\n"
 "%s"
 
-#: share/meta-task/compssUsers.pl:11
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "工作站"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "办公工作站"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -355,7 +409,7 @@ msgstr ""
 "办公程序: 字处理(OpenOffice.org Writer、Kword), 电子表格(OpenOffice.org "
 "Calc、Kspread)、PDF 阅读器等"
 
-#: share/meta-task/compssUsers.pl:16
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -363,294 +417,294 @@ msgid ""
 msgstr ""
 "办公程序: 字处理(kword、abiword), 电子表格(kspread、gnumeric)、pdf 阅读器等"
 
-#: share/meta-task/compssUsers.pl:21
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "游戏机"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "游戏程序: 街机、棋盘、战略等等"
 
-#: share/meta-task/compssUsers.pl:25
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "多媒体工作站"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "声音和视频播放/编辑程序"
 
-#: share/meta-task/compssUsers.pl:31
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Internet 工作站"
 
-#: share/meta-task/compssUsers.pl:32
+#: 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:37
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "网络计算机(客户端)"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "SSH 等不同协议客户端"
 
-#: share/meta-task/compssUsers.pl:43
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "简化计算机配置的工具"
 
-#: share/meta-task/compssUsers.pl:47
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "控制台工具"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "编辑器, shell, 文件工具, 终端"
 
-#: share/meta-task/compssUsers.pl:52 share/meta-task/compssUsers.pl:153
-#: share/meta-task/compssUsers.pl:155
+#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:156
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "Development"
 msgstr "开发"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
+#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C 和 C++ 开发库, 程序及头文件"
 
-#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:160
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:163
 #, c-format
 msgid "Documentation"
 msgstr "文档"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:161
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "有关 Linux 和自由软件的书籍和指南"
 
-#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:165
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base。第三方应用程序支持"
 
-#: share/meta-task/compssUsers.pl:71
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Web 服务器"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:75
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "群件"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab 服务器"
 
-#: share/meta-task/compssUsers.pl:79 share/meta-task/compssUsers.pl:120
+#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "防火墙/路由器"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet 网关"
 
-#: share/meta-task/compssUsers.pl:83
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "邮件/新闻"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix 邮件服务器、Inn 新闻服务器"
 
-#: share/meta-task/compssUsers.pl:87
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "目录服务器"
 
-#: share/meta-task/compssUsers.pl:91
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP 服务器"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:95
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "域名和网络信息服务器"
 
-#: share/meta-task/compssUsers.pl:99
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "文件和打印机共享服务器"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS 服务器、Samba 服务器"
 
-#: share/meta-task/compssUsers.pl:103 share/meta-task/compssUsers.pl:116
+#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
 #, c-format
 msgid "Database"
 msgstr "数据库"
 
-#: share/meta-task/compssUsers.pl:104
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL 和 MySQL 数据库服务"
 
-#: share/meta-task/compssUsers.pl:108
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache 和 Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:112
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "邮件"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix 邮件服务器"
 
-#: share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL 或 MySQL 数据库服务"
 
-#: share/meta-task/compssUsers.pl:124
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "网络计算机服务器"
 
-#: share/meta-task/compssUsers.pl:125
+#: 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:131
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "图形环境"
 
-#: share/meta-task/compssUsers.pl:133
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE 工作站"
 
-#: share/meta-task/compssUsers.pl:134
+#: 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:138
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME 工作站"
 
-#: share/meta-task/compssUsers.pl:139
+#: 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:142
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "IceWm Desktop"
 msgstr "IceWM 桌面"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:149
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "其它图形桌面"
 
-#: share/meta-task/compssUsers.pl:147
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker、Enlightenment、Fvwm 等"
 
-#: share/meta-task/compssUsers.pl:170
+#: share/meta-task/compssUsers.pl:173
 #, c-format
 msgid "Utilities"
 msgstr "工具"
 
-#: share/meta-task/compssUsers.pl:172 share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH 服务器"
 
-#: share/meta-task/compssUsers.pl:177
+#: share/meta-task/compssUsers.pl:180
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:178
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin 远程配置服务器"
 
-#: share/meta-task/compssUsers.pl:182
+#: share/meta-task/compssUsers.pl:185
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "网络工具/监视"
 
-#: share/meta-task/compssUsers.pl:183
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "监视工具、进程统计、tcpdump、nmap……"
 
-#: share/meta-task/compssUsers.pl:187
+#: share/meta-task/compssUsers.pl:190
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva 向导"
 
-#: share/meta-task/compssUsers.pl:188
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Wizards to configure server"
 msgstr "服务器配置向导"
@@ -664,7 +718,7 @@ msgstr ""
 "发生错误, 可是我不知道该怎样处理才好。\n"
 "继续下去会怎样就看您的运气了。"
 
-#: steps.pm:437
+#: steps.pm:442
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -691,12 +745,12 @@ msgstr "Mandriva Linux 安装 %s"
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> 可在元素间切换"
 
-#: steps_gtk.pm:84
+#: steps_gtk.pm:89
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg 启动很慢，请稍候..."
 
-#: steps_gtk.pm:194
+#: steps_gtk.pm:203
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -708,17 +762,17 @@ msgstr ""
 "如果您真的遇到问题的话，可以试试文本安装。要进入文本安装，请在启动时按“F1”，"
 "然后输入“text”。"
 
-#: steps_gtk.pm:228
+#: steps_gtk.pm:236
 #, c-format
 msgid "Install Mandriva KDE Desktop"
 msgstr "安装 Mandriva KDE 桌面"
 
-#: steps_gtk.pm:229
+#: steps_gtk.pm:237
 #, c-format
 msgid "Install Mandriva GNOME Desktop"
 msgstr "安装 Mandriva GNOME 桌面"
 
-#: steps_gtk.pm:230
+#: steps_gtk.pm:238
 #, c-format
 msgid "Custom install"
 msgstr "自定义安装"
@@ -743,190 +797,190 @@ msgstr "自定义桌面"
 msgid "Here's a preview of the '%s' desktop."
 msgstr "这是“%s”桌面的预览。"
 
-#: steps_gtk.pm:275
+#: steps_gtk.pm:295
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "单击图像可查看更大的预览"
 
-#: steps_gtk.pm:287 steps_interactive.pm:618 steps_list.pm:30
+#: steps_gtk.pm:313 steps_interactive.pm:626 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "程序组选择"
 
-#: steps_gtk.pm:308 steps_interactive.pm:635
+#: steps_gtk.pm:334 steps_interactive.pm:643
 #, c-format
 msgid "Individual package selection"
 msgstr "选择单个软件包"
 
-#: steps_gtk.pm:330 steps_interactive.pm:561
+#: steps_gtk.pm:358 steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "总共大小: %d / %d MB"
 
-#: steps_gtk.pm:375
+#: steps_gtk.pm:401
 #, c-format
 msgid "Bad package"
 msgstr "有错的软件包"
 
-#: steps_gtk.pm:377
+#: steps_gtk.pm:403
 #, c-format
 msgid "Version: "
 msgstr "版本: "
 
-#: steps_gtk.pm:378
+#: steps_gtk.pm:404
 #, c-format
 msgid "Size: "
 msgstr "大小: "
 
-#: steps_gtk.pm:378
+#: steps_gtk.pm:404
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:379
+#: steps_gtk.pm:405
 #, c-format
 msgid "Importance: "
 msgstr "重要程度: "
 
-#: steps_gtk.pm:413
+#: steps_gtk.pm:439
 #, c-format
 msgid "You can not select/unselect this package"
 msgstr "您不能改变这个软件包的选定"
 
-#: steps_gtk.pm:417
+#: steps_gtk.pm:443
 #, c-format
 msgid "due to missing %s"
 msgstr "由于缺少 %s"
 
-#: steps_gtk.pm:418
+#: steps_gtk.pm:444
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由于不满足的 %s"
 
-#: steps_gtk.pm:419
+#: steps_gtk.pm:445
 #, c-format
 msgid "trying to promote %s"
 msgstr "尝试推广 %s"
 
-#: steps_gtk.pm:420
+#: steps_gtk.pm:446
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: steps_gtk.pm:425
+#: steps_gtk.pm:451
 #, c-format
 msgid ""
 "You can not select this package as there is not enough space left to install "
 "it"
 msgstr "您不可以选择这个软件包。没有足够空间安装它。"
 
-#: steps_gtk.pm:428
+#: steps_gtk.pm:454
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "即将安装下列软件包"
 
-#: steps_gtk.pm:429
+#: steps_gtk.pm:455
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "即将卸载下列软件包"
 
-#: steps_gtk.pm:454
+#: steps_gtk.pm:480
 #, c-format
 msgid "This is a mandatory package, it can not be unselected"
 msgstr "这个软件包是必需的, 不能取消选定"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:482
 #, c-format
 msgid "You can not unselect this package. It is already installed"
 msgstr "您不可以取消选择这个软件包。它已经安装过了"
 
-#: steps_gtk.pm:458
+#: steps_gtk.pm:484
 #, c-format
 msgid "You can not unselect this package. It must be upgraded"
 msgstr "您不能不选择这个软件包。它必须升级"
 
-#: steps_gtk.pm:462
+#: steps_gtk.pm:488
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "自动显示选中的软件包"
 
-#: steps_gtk.pm:464
+#: steps_gtk.pm:494
 #, c-format
 msgid "Install"
 msgstr "安装"
 
-#: steps_gtk.pm:467
+#: steps_gtk.pm:497
 #, c-format
 msgid "Load/Save selection"
 msgstr "装入/保存选择"
 
-#: steps_gtk.pm:468
+#: steps_gtk.pm:498
 #, c-format
 msgid "Updating package selection"
 msgstr "更新软件包选择"
 
-#: steps_gtk.pm:473
+#: steps_gtk.pm:503
 #, c-format
 msgid "Minimal install"
 msgstr "最小安装"
 
-#: steps_gtk.pm:487
+#: steps_gtk.pm:516
 #, c-format
 msgid "Software Management"
 msgstr "软件管理"
 
-#: steps_gtk.pm:487 steps_interactive.pm:447
+#: steps_gtk.pm:516 steps_interactive.pm:452
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "选择您想要安装的软件包"
 
-#: steps_gtk.pm:504 steps_interactive.pm:649 steps_list.pm:32
+#: steps_gtk.pm:533 steps_interactive.pm:657 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "安装"
 
-#: steps_gtk.pm:530
+#: steps_gtk.pm:562
 #, c-format
 msgid "No details"
 msgstr "无细节"
 
-#: steps_gtk.pm:559
+#: steps_gtk.pm:577
 #, c-format
 msgid "Time remaining:"
 msgstr "剩余时间:"
 
-#: steps_gtk.pm:560
+#: steps_gtk.pm:578
 #, c-format
 msgid "(estimating...)"
 msgstr "(正在估计...)"
 
-#: steps_gtk.pm:573
+#: steps_gtk.pm:604
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d 个软件包"
 
-#: steps_gtk.pm:619 steps_interactive.pm:837 steps_list.pm:43
+#: steps_gtk.pm:650 steps_interactive.pm:820 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "摘要"
 
-#: steps_gtk.pm:636
+#: steps_gtk.pm:669
 #, c-format
 msgid "Configure"
 msgstr "配置"
 
-#: steps_gtk.pm:653 steps_interactive.pm:833 steps_interactive.pm:984
+#: steps_gtk.pm:686 steps_interactive.pm:816 steps_interactive.pm:967
 #, c-format
 msgid "not configured"
 msgstr "未配置"
 
-#: steps_gtk.pm:694
+#: steps_gtk.pm:720
 #, c-format
 msgid "Media Selection"
 msgstr "介质选择"
 
-#: steps_gtk.pm:704 steps_interactive.pm:335
+#: steps_gtk.pm:729 steps_interactive.pm:334
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -935,7 +989,7 @@ msgstr ""
 "找到了下列安装介质。\n"
 "如果您想要跳过其中一些, 请不要选中。"
 
-#: steps_gtk.pm:700 steps_interactive.pm:337
+#: steps_gtk.pm:745 steps_interactive.pm:340
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -947,96 +1001,79 @@ msgstr ""
 "然后，安装将会从硬盘继续进行。当系统安装完成后，软件包仍然保留，以供日后添加"
 "软件使用。"
 
-#: steps_gtk.pm:702 steps_interactive.pm:339
+#: steps_gtk.pm:747 steps_interactive.pm:342
 #, c-format
 msgid "Copy whole CDs"
 msgstr "复制整张光盘"
 
-#: steps_interactive.pm:38
+#: steps_interactive.pm:39
 #, c-format
 msgid "An error occurred"
 msgstr "发生了一个错误"
 
-#: steps_interactive.pm:102
+#: steps_interactive.pm:104
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "请选择您使用的键盘布局。"
 
-#: steps_interactive.pm:105
+#: steps_interactive.pm:108
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "在此列出了可用的全部键盘:"
 
-#: steps_interactive.pm:136
+#: steps_interactive.pm:139
 #, c-format
 msgid "Install/Upgrade"
 msgstr "安装/升级"
 
-#: steps_interactive.pm:134
+#: steps_interactive.pm:143
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "现在要新装还是升级?"
 
-#: steps_interactive.pm:138
+#: steps_interactive.pm:145
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "安装"
 
-#: steps_interactive.pm:144
+#: steps_interactive.pm:147
 #, c-format
 msgid "Upgrade %s"
 msgstr "升级 %s"
 
-#: steps_interactive.pm:148
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
 msgstr "不支持从 32 位发行版升级到 64 位发行版"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:155
 #, c-format
 msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
 msgstr "不支持从 64 位发行版升级到 32 位发行版"
 
-#: steps_interactive.pm:162
-#, 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"
-"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 in an upgrade。如果您选择继续的话，KDE 4 将会替换\n"
-"KDE 3，而您关于 KDE 配置的设置也将丢失。\n"
-"要仍然升级但却保留 KDE 3.5，并且保留您的个人设置，请重新启动您的系统，然后使\n"
-"用 Mandriva 更新小程序升级。"
-
-#: steps_interactive.pm:180
+#: steps_interactive.pm:174
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s 的加密密钥"
 
-#: steps_interactive.pm:199
+#: steps_interactive.pm:207
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "取消安装，重新启动系统"
 
-#: steps_interactive.pm:200
+#: steps_interactive.pm:208
 #, c-format
 msgid "New Installation"
 msgstr "全新安装"
 
-#: steps_interactive.pm:201
+#: steps_interactive.pm:209
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "升级先前的安装(不推荐)"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:213
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1053,17 +1090,17 @@ msgstr ""
 "\n"
 "警告：您在选择“全新安装”之前应该备份您所有的个人数据。"
 
-#: steps_interactive.pm:247
+#: steps_interactive.pm:255
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:247
+#: steps_interactive.pm:255
 #, c-format
 msgid "Configuring IDE"
 msgstr "配置 IDE"
 
-#: steps_interactive.pm:284
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1072,7 +1109,7 @@ msgstr ""
 "无法创建启动空间(1MB)！安装将继续, 但如需启动系统, 您可用“Drak 磁盘管理”创建"
 "启动分区"
 
-#: steps_interactive.pm:289
+#: steps_interactive.pm:297
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1082,7 +1119,7 @@ msgstr ""
 "您需要创建一个 PPC PReP 启动空间！安装将继续, 但如需启动系统, 您可用“Drak 磁"
 "盘管理”创建启动分区"
 
-#: steps_interactive.pm:381
+#: steps_interactive.pm:378
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1095,19 +1132,19 @@ msgstr ""
 "请在驱动器中插入标有“%s”的光盘, 然后单击“确定”。\n"
 "如果您没有这张光盘, 请单击“取消”, 放弃安装这张光盘上的软件。"
 
-#: steps_interactive.pm:403
+#: steps_interactive.pm:408
 #, c-format
 msgid "Looking for available packages..."
 msgstr "正在寻找可安装的程序..."
 
-#: steps_interactive.pm:411
+#: steps_interactive.pm:416
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr "系统的剩余空间不足以完成安装或升级(%d MB > %d MB)"
 
-#: steps_interactive.pm:459
+#: steps_interactive.pm:464
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1116,134 +1153,134 @@ msgstr ""
 "请选择装入或保存软件包选择息。\n"
 "格式与自动安装生成的文件一样。"
 
-#: steps_interactive.pm:461
+#: steps_interactive.pm:466
 #, c-format
 msgid "Load"
 msgstr "装入"
 
-#: steps_interactive.pm:461
+#: steps_interactive.pm:466
 #, c-format
 msgid "Save"
 msgstr "保存"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:474
 #, c-format
 msgid "Bad file"
 msgstr "文件有错"
 
-#: steps_interactive.pm:485
+#: steps_interactive.pm:490
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:486
+#: steps_interactive.pm:491
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:489
+#: steps_interactive.pm:494
 #, c-format
 msgid "Desktop Selection"
 msgstr "桌面选择"
 
-#: steps_interactive.pm:490
+#: steps_interactive.pm:495
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "您可以选择您的工作站配置文件："
 
-#: steps_interactive.pm:575
+#: steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "您选择的超过可用空间"
 
-#: steps_interactive.pm:590
+#: steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "安装类型"
 
-#: steps_interactive.pm:591
+#: steps_interactive.pm:597
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr "您没有选择任何的组件, 请选择最小安装:"
 
-#: steps_interactive.pm:594
+#: steps_interactive.pm:602
 #, c-format
 msgid "With X"
 msgstr "安装 X"
 
-#: steps_interactive.pm:595
+#: steps_interactive.pm:603
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "安装基础文档(建议!)"
 
-#: steps_interactive.pm:596
+#: steps_interactive.pm:604
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "真正最小安装(注意没有 urpmi 包管理工具)"
 
-#: steps_interactive.pm:650
+#: steps_interactive.pm:658
 #, c-format
 msgid "Preparing installation"
 msgstr "正在准备安装"
 
-#: steps_interactive.pm:658
+#: steps_interactive.pm:666
 #, c-format
 msgid "Installing package %s"
 msgstr "正在安装软件包 %s"
 
-#: steps_interactive.pm:682
+#: steps_interactive.pm:690
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "排列软件包时出错: "
 
-#: steps_interactive.pm:682
+#: steps_interactive.pm:690
 #, c-format
 msgid "Go on anyway?"
 msgstr "真的要继续?"
 
-#: steps_interactive.pm:686
+#: steps_interactive.pm:694
 #, c-format
 msgid "Retry"
 msgstr "重试"
 
-#: steps_interactive.pm:687
+#: steps_interactive.pm:695
 #, c-format
 msgid "Skip this package"
 msgstr "跳过此软件包"
 
-#: steps_interactive.pm:688
+#: steps_interactive.pm:696
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "跳过介质“%s”中的全部软件包"
 
-#: steps_interactive.pm:689
+#: steps_interactive.pm:697
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "返回介质和软件包选择"
 
-#: steps_interactive.pm:692
+#: steps_interactive.pm:700
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "安装软件包 %s 时出错。"
 
-#: steps_interactive.pm:710
+#: steps_interactive.pm:719
 #, c-format
 msgid "Post-install configuration"
 msgstr "安装后的配置"
 
-#: steps_interactive.pm:717
+#: steps_interactive.pm:726
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "请确定更新模块介质位于驱动器 %s"
 
-#: steps_interactive.pm:745 steps_list.pm:47
+#: steps_interactive.pm:754 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "更新"
 
-#: steps_interactive.pm:746
+#: steps_interactive.pm:755
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1262,90 +1299,95 @@ msgstr ""
 "\n"
 "您是否要安装升级包?"
 
-#: steps_interactive.pm:849
+#: steps_interactive.pm:862
 #, c-format
 msgid "%s on %s"
 msgstr "位于 %2$s 上的 %1$s"
 
-#: steps_interactive.pm:912 steps_interactive.pm:919 steps_interactive.pm:932
-#: steps_interactive.pm:949 steps_interactive.pm:964
+#: steps_interactive.pm:895 steps_interactive.pm:902 steps_interactive.pm:915
+#: steps_interactive.pm:932 steps_interactive.pm:947
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: steps_interactive.pm:933 steps_interactive.pm:950
+#: steps_interactive.pm:916 steps_interactive.pm:933
 #, c-format
 msgid "Sound card"
 msgstr "声卡"
 
-#: steps_interactive.pm:953
+#: steps_interactive.pm:936
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "您有 ISA 声卡吗?"
 
-#: steps_interactive.pm:955
+#: steps_interactive.pm:938
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "安装之后运行“alsaconf”或“sndconfig”来配置您的声卡"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:940
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "没有检测到声卡。请在安装之后尝试“Drak 硬件配置”。"
 
-#: steps_interactive.pm:965
+#: steps_interactive.pm:948
 #, c-format
 msgid "Graphical interface"
 msgstr "图形界面"
 
-#: steps_interactive.pm:971 steps_interactive.pm:982
+#: steps_interactive.pm:954 steps_interactive.pm:965
 #, c-format
 msgid "Network & Internet"
 msgstr "网络和 Internet"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:966
 #, c-format
 msgid "Proxies"
 msgstr "代理服务器"
 
-#: steps_interactive.pm:984
+#: steps_interactive.pm:967
 #, c-format
 msgid "configured"
 msgstr "已配置"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:977
 #, c-format
 msgid "Security Level"
 msgstr "安全级别"
 
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:996
 #, c-format
 msgid "Firewall"
 msgstr "防火墙"
 
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1000
 #, c-format
 msgid "activated"
 msgstr "已激活"
 
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1000
 #, c-format
 msgid "disabled"
 msgstr "已禁用"
 
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1014
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "您还没有配置过 X。您真的想要这样吗?"
 
-#: steps_interactive.pm:1058
+#: steps_interactive.pm:1042
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "正在准备引导程序..."
 
-#: steps_interactive.pm:1068
+#: steps_interactive.pm:1043
+#, c-format
+msgid "Be patient, this may take a while..."
+msgstr ""
+
+#: steps_interactive.pm:1054
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1357,24 +1399,24 @@ msgstr ""
 "续, 不过您需要使用 BootX 或其它方式启动您的机器。根文件系统的内核参数是："
 "root=%s"
 
-#: steps_interactive.pm:1087
+#: steps_interactive.pm:1068
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr "在此安全级别中, 只有管理员才能访问 Windows 分区中的文件。"
 
-#: steps_interactive.pm:1121
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "请在驱动器 %s 中插入一张空白软盘"
 
-#: steps_interactive.pm:1123
+#: steps_interactive.pm:1102
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "正在创建自动安装软盘..."
 
-#: steps_interactive.pm:1134
+#: steps_interactive.pm:1113
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1385,16 +1427,11 @@ msgstr ""
 "\n"
 "您真的要现在退出吗?"
 
-#: steps_interactive.pm:1144
+#: steps_interactive.pm:1123
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
 
-#: steps_interactive.pm:1147
-#, c-format
-msgid "Reboot"
-msgstr "重新启动"
-
 #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
 #, c-format
@@ -1534,31 +1571,6 @@ msgid ""
 "Exit"
 msgstr "退出"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "U 盘上的桌面"
-
-#: ../../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 轻松探索 Linux"
-
-#: ../../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 在手，应用无忧"
-
 #~ msgid "Contacting the mirror to get the list of available packages..."
 #~ msgstr "正在连接镜像网站以取得可供安装的软件包的列表..."