summaryrefslogtreecommitdiffstats
path: root/perl-install/install/share/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/install/share/po/zh_CN.po')
-rw-r--r--perl-install/install/share/po/zh_CN.po429
1 files changed, 201 insertions, 228 deletions
diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po
index 96c203d73..639022f89 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: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\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,31 +17,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 "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?"
@@ -81,92 +56,92 @@ 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 "
"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 "无法在此镜像上找到软件包列表文件。请确定位置正确。"
-#: 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"
@@ -185,18 +160,18 @@ msgstr ""
"使\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"
@@ -209,72 +184,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 之中"
@@ -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, "
@@ -410,262 +389,244 @@ msgid ""
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 "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 "一组工具, 用于收发电子邮件及新闻组(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 "编辑器, shell, 文件工具, 终端"
#: 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 "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 "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 "邮件/新闻"
-#: 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
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "KDE 桌面"
@@ -677,54 +638,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 "服务器配置向导"
@@ -822,17 +781,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 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 "安装"
@@ -980,7 +939,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 "摘要"
@@ -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,7 +959,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"
@@ -1009,7 +968,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 "
@@ -1021,7 +980,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 "复制整张光盘"
@@ -1041,59 +1000,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"
@@ -1110,17 +1059,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 "
@@ -1129,7 +1078,7 @@ msgstr ""
"无法创建启动空间(1MB)!安装将继续, 但如需启动系统, 您可用“Drak 磁盘管理”创建"
"启动分区"
-#: 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 启动空间!安装将继续, 但如需启动系统, 您可用“Drak 磁"
"盘管理”创建启动分区"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1152,19 +1101,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 MB > %d MB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1173,134 +1122,134 @@ 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"
"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 "真正最小安装(注意没有 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"
@@ -1319,95 +1268,95 @@ 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 "
"card"
msgstr "安装之后运行“alsaconf”或“sndconfig”来配置您的声卡"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "没有检测到声卡。请在安装之后尝试“Drak 硬件配置”。"
-#: 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 "网络和 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 "安全级别"
-#: 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 "
@@ -1419,24 +1368,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 "在此安全级别中, 只有管理员才能访问 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"
@@ -1447,7 +1396,7 @@ msgstr ""
"\n"
"您真的要现在退出吗?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "恭喜"
@@ -1591,6 +1540,30 @@ msgid ""
"Exit"
msgstr "退出"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "U 盘上的桌面"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% 开放源代码的 Mandriva Linux 发行版"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "用 Mandriva One 轻松探索 Linux"
+
+#~ 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 "不支持从 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"