1 files changed, 66 insertions, 55 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index 1f052d5be..34d033fed 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
-"POT-Creation-Date: 2014-11-19 20:51+0100\n"
+"POT-Creation-Date: 2014-12-28 14:13+0200\n"
 "PO-Revision-Date: 2009-04-09 11:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mageia i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 #: diskdrake/interactive.pm:864 diskdrake/interactive.pm:926
 #: diskdrake/interactive.pm:1044 diskdrake/interactive.pm:1274
 #: diskdrake/interactive.pm:1332 do_pkgs.pm:341 do_pkgs.pm:386
-#: harddrake/sound.pm:77 interactive.pm:712 pkgs.pm:288
+#: harddrake/sound.pm:77 interactive.pm:712 pkgs.pm:293
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
@@ -96,7 +96,7 @@ msgstr "根分区的第一扇区"
 msgid "On Floppy"
 msgstr "在软盘上"
 
-#: any.pm:358 pkgs.pm:284 ugtk2.pm:526 ugtk3.pm:602
+#: any.pm:358 pkgs.pm:289 ugtk2.pm:526 ugtk3.pm:602
 #, c-format
 msgid "Skip"
 msgstr "跳过"
@@ -1297,7 +1297,7 @@ msgstr "交换"
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:424 fs/partitioning_wizard.pm:402 services.pm:194
+#: diskdrake/hd_gtk.pm:424 fs/partitioning_wizard.pm:402 services.pm:195
 #, c-format
 msgid "Other"
 msgstr "其它"
@@ -2219,7 +2219,7 @@ msgstr "下列软件包需要安装: \n"
 msgid "Installing packages..."
 msgstr "正在安装软件包..."
 
-#: do_pkgs.pm:386 pkgs.pm:288
+#: do_pkgs.pm:386 pkgs.pm:293
 #, c-format
 msgid "Removing packages..."
 msgstr "正在删除软件包..."
@@ -4875,9 +4875,10 @@ msgstr ""
 #: messages.pm:115
 #, c-format
 msgid ""
-"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mageia User's Guide."
-msgstr "关于安装后如何配置您的系统, 请查看 Mageia 官方用户手册。"
+"After rebooting and logging into Mageia, you will see the MageiaWelcome "
+"screen.\n"
+"It is full of very useful information and links."
+msgstr ""
 
 #: modules/interactive.pm:19
 #, c-format
@@ -5059,39 +5060,39 @@ msgstr ""
 "一次数据完整性检查失败了。\n"
 "这意味着, 如果继续往硬盘里写入任何东西, 硬盘将可能随时坏掉, 损坏数据"
 
-#: pkgs.pm:255 pkgs.pm:258 pkgs.pm:271
+#: pkgs.pm:260 pkgs.pm:263 pkgs.pm:276
 #, c-format
 msgid "Unused packages removal"
 msgstr "删除不需要的软件包"
 
-#: pkgs.pm:255
+#: pkgs.pm:260
 #, c-format
 msgid "Finding unused hardware packages..."
 msgstr "正在查找不需要的硬件软件包..."
 
-#: pkgs.pm:258
+#: pkgs.pm:263
 #, c-format
 msgid "Finding unused localization packages..."
 msgstr "正在查找不需要的本地化软件包..."
 
-#: pkgs.pm:272
+#: pkgs.pm:277
 #, c-format
 msgid ""
 "We have detected that some packages are not needed for your system "
 "configuration."
 msgstr "我们检测到您的系统配置无需下列软件包。"
 
-#: pkgs.pm:273
+#: pkgs.pm:278
 #, c-format
 msgid "We will remove the following packages, unless you choose otherwise:"
 msgstr "我们将会删除这些软件包，而您可以在进行之前对其微调:"
 
-#: pkgs.pm:276 pkgs.pm:277
+#: pkgs.pm:281 pkgs.pm:282
 #, c-format
 msgid "Unused hardware support"
 msgstr "未使用的硬件支持"
 
-#: pkgs.pm:280 pkgs.pm:281
+#: pkgs.pm:285 pkgs.pm:286
 #, c-format
 msgid "Unused localization"
 msgstr "未使用的本地化"
@@ -6266,29 +6267,34 @@ msgstr ""
 
 #: services.pm:114
 #, c-format
+msgid "Packet filtering firewall for IPv6"
+msgstr ""
+
+#: services.pm:115
+#, c-format
 msgid ""
 "The SMB/CIFS protocol enables to share access to files & printers and also "
 "integrates with a Windows Server domain"
 msgstr "SMB/CIFS 协议用户访问共享的文件和打印机，并且与 Windows Server 域集成"
 
-#: services.pm:115
+#: services.pm:116
 #, c-format
 msgid "Launch the sound system on your machine"
 msgstr "启动计算机上的声音系统"
 
-#: services.pm:116
+#: services.pm:117
 #, c-format
 msgid "layer for speech analysis"
 msgstr ""
 
-#: services.pm:117
+#: services.pm:118
 #, c-format
 msgid ""
 "Secure Shell is a network protocol that allows data to be exchanged over a "
 "secure channel between two computers"
 msgstr "安全 Shell (SSH)网络协议允许在两台计算机之间通过安全通道交换数据"
 
-#: services.pm:118
+#: services.pm:119
 #, c-format
 msgid ""
 "Syslog is the facility by which many daemons use to log messages\n"
@@ -6297,121 +6303,121 @@ msgstr ""
 "Syslog 是这样一个设施, 很多其它的后台服务利用它在各种系统日志文件\n"
 "中记录日志消息。一直运行 syslog 是个好主意。"
 
-#: services.pm:120
+#: services.pm:121
 #, c-format
 msgid "Moves the generated persistent udev rules to /etc/udev/rules.d"
 msgstr ""
 
-#: services.pm:121
+#: services.pm:122
 #, c-format
 msgid "Load the drivers for your usb devices."
 msgstr "装入您 USB 设备的驱动程序。"
 
-#: services.pm:122
+#: services.pm:123
 #, c-format
 msgid "A lightweight network traffic monitor"
 msgstr ""
 
-#: services.pm:123
+#: services.pm:124
 #, c-format
 msgid "Starts the X Font Server."
 msgstr "启动 X 字体服务器。"
 
-#: services.pm:124
+#: services.pm:125
 #, c-format
 msgid "Starts other deamons on demand."
 msgstr "按需启动其它守护程序。"
 
-#: services.pm:153
+#: services.pm:154
 #, c-format
 msgid "Printing"
 msgstr "打印"
 
-#: services.pm:156
+#: services.pm:157
 #, c-format
 msgid "Internet"
 msgstr "互联网"
 
-#: services.pm:161
+#: services.pm:162
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Networking"
 msgstr "联网"
 
-#: services.pm:163
+#: services.pm:164
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: services.pm:169
+#: services.pm:170
 #, c-format
 msgid "Remote Administration"
 msgstr "远程管理"
 
-#: services.pm:178
+#: services.pm:179
 #, c-format
 msgid "Database Server"
 msgstr "数据库服务器"
 
-#: services.pm:189 services.pm:226
+#: services.pm:190 services.pm:227
 #, c-format
 msgid "Services"
 msgstr "服务"
 
-#: services.pm:189
+#: services.pm:190
 #, c-format
 msgid "Choose which services should be automatically started at boot time"
 msgstr "选择开机时自动启动的服务"
 
-#: services.pm:207
+#: services.pm:208
 #, c-format
 msgid "%d activated for %d registered"
 msgstr "%2$d 项已注册, %1$d 项已激活"
 
-#: services.pm:230
+#: services.pm:231
 #, c-format
 msgid "running"
 msgstr "运行中"
 
-#: services.pm:230
+#: services.pm:231
 #, c-format
 msgid "stopped"
 msgstr "已停止"
 
-#: services.pm:235
+#: services.pm:236
 #, c-format
 msgid "Services and daemons"
 msgstr "服务和守护程序"
 
-#: services.pm:241
+#: services.pm:242
 #, c-format
 msgid ""
 "No additional information\n"
 "about this service, sorry."
 msgstr "没有该服务的附加信息。"
 
-#: services.pm:248
+#: services.pm:249
 #, c-format
 msgid "Start when requested"
 msgstr "请求时启动"
 
-#: services.pm:248
+#: services.pm:249
 #, c-format
 msgid "On boot"
 msgstr "启动时"
 
-#: services.pm:265
+#: services.pm:266
 #, c-format
 msgid "Start"
 msgstr "启动"
 
-#: services.pm:265
+#: services.pm:266
 #, c-format
 msgid "Stop"
 msgstr "停止"
 
-#: standalone.pm:26
+#: standalone.pm:27
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -6440,7 +6446,7 @@ msgstr ""
 "有, 请写信给自由软件基金会, 地址是 Free Software Foundation, Inc., \n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
 
-#: standalone.pm:45
+#: standalone.pm:46
 #, c-format
 msgid ""
 "[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n"
@@ -6466,7 +6472,7 @@ msgstr ""
 "--help                :显示此信息。\n"
 "--version             :显示版本号。\n"
 
-#: standalone.pm:57
+#: standalone.pm:58
 #, c-format
 msgid ""
 "[--boot]\n"
@@ -6479,7 +6485,7 @@ msgstr ""
 "  --boot            - 启用配置引导程序\n"
 "默认模式: 可配置自动登录特性"
 
-#: standalone.pm:61
+#: standalone.pm:62
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS] [PROGRAM_NAME]\n"
@@ -6496,7 +6502,7 @@ msgstr ""
 "  --report          - 程序应该是 Mageia 工具之一\n"
 "  --incident        - 程序应该是 Mageia 工具之一"
 
-#: standalone.pm:67
+#: standalone.pm:68
 #, c-format
 msgid ""
 "[--add]\n"
@@ -6513,7 +6519,7 @@ msgstr ""
 "  --internet        - 配置 Internet\n"
 "  --wizard          - 同 --add"
 
-#: standalone.pm:73
+#: standalone.pm:74
 #, c-format
 msgid ""
 "\n"
@@ -6544,7 +6550,7 @@ msgstr ""
 "                 :应用程序名, 如 so 代表 staroffice \n"
 "                 :gs 代表 ghostscript, 仅在此处可用。"
 
-#: standalone.pm:88
+#: standalone.pm:89
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
@@ -6572,17 +6578,17 @@ msgstr ""
 "--addclient      :将客户机添加到 MTS(需要 MAC 地址、IP、nbi 映像名称)\n"
 "--delclient      :将客户机从 MTS 中删除(需要 MAC 地址、IP、nbi 映像名称)"
 
-#: standalone.pm:100
+#: standalone.pm:101
 #, c-format
 msgid "[keyboard]"
 msgstr "[键盘]"
 
-#: standalone.pm:101
+#: standalone.pm:102
 #, c-format
 msgid "[--file=myfile] [--word=myword] [--explain=regexp] [--alert]"
 msgstr "[--file=myfile] [--word=myword] [--explain=regexp] [--alert]"
 
-#: standalone.pm:102
+#: standalone.pm:103
 #, c-format
 msgid ""
 "[OPTIONS]\n"
@@ -6605,7 +6611,7 @@ msgstr ""
 "--status: 如果连接则返回 1 否则返回 0, 然后退出。\n"
 "--quiet: 不进行交互。用于断开连接。"
 
-#: standalone.pm:112
+#: standalone.pm:113
 #, fuzzy, c-format
 msgid ""
 "[OPTION]...\n"
@@ -6622,7 +6628,7 @@ msgstr ""
 "  --changelog-first      在描述窗口中的文件列表前显示更改日志\n"
 "  --merge-all-rpmnew     计划合并找到的所有 .rpmnew/.rpmsave 文件"
 
-#: standalone.pm:117
+#: standalone.pm:118
 #, c-format
 msgid ""
 "[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-"
@@ -6631,7 +6637,7 @@ msgstr ""
 "[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-"
 "usbtable] [--dynamic=dev]"
 
-#: standalone.pm:118
+#: standalone.pm:119
 #, c-format
 msgid ""
 " [everything]\n"
@@ -6642,7 +6648,7 @@ msgstr ""
 "       XFdrake [--noauto] 显示器\n"
 "       XFdrake 分辨率"
 
-#: standalone.pm:155
+#: standalone.pm:156
 #, c-format
 msgid ""
 "\n"
@@ -6738,6 +6744,11 @@ msgid "Installation failed"
 msgstr "安装失败"
 
 #~ msgid ""
+#~ "Information on configuring your system is available in the post\n"
+#~ "install chapter of the Official Mageia User's Guide."
+#~ msgstr "关于安装后如何配置您的系统, 请查看 Mageia 官方用户手册。"
+
+#~ msgid ""
 #~ "You may need to change your Open Firmware boot-device to\n"
 #~ " enable the bootloader.  If you do not see the bootloader prompt at\n"
 #~ " reboot, hold down Command-Option-O-F at reboot and enter:\n"