sync with code

1 files changed, 178 insertions, 75 deletions

diff --git a/perl-install/standalone/po/zh_CN.po b/perl-install/standalone/po/zh_CN.po
index 592eef320..1a2f0ecc5 100644
--- a/perl-install/standalone/po/zh_CN.po
+++ b/perl-install/standalone/po/zh_CN.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# 
+#
 # Translators:
 # Danny Zeng <danny@zeng.com.cn>, 2000,2002
 # Funda Wang <fundawang@linux.net.cn>, 2002-2005
@@ -10,14 +10,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-02 08:56+0200\n"
+"POT-Creation-Date: 2015-04-05 21:35+0200\n"
 "PO-Revision-Date: 2015-03-06 19:08+0000\n"
 "Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/"
+"language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: display_help:54 display_help:59 drakbug:173 drakperm:134
@@ -86,7 +87,9 @@ msgstr "警告"
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
-msgstr "您的系统引导程序并不位于帧缓存模式。要激活图形化引导程序, 请在引导程序配置工具中选择图形视频模式。"
+msgstr ""
+"您的系统引导程序并不位于帧缓存模式。要激活图形化引导程序, 请在引导程序配置工"
+"具中选择图形视频模式。"
 
 #: drakboot:148
 #, c-format
@@ -156,9 +159,12 @@ msgstr "显示模式"
 #: drakboot:276
 #, c-format
 msgid ""
-"Please choose a video mode, it will be applied to each of the boot entries selected below.\n"
+"Please choose a video mode, it will be applied to each of the boot entries "
+"selected below.\n"
 "Be sure your video card supports the mode you choose."
-msgstr "请选择视频模式, 该模式将应用到下面所选的每个启动项。\n请确定您的视频卡支持您所选的模式。"
+msgstr ""
+"请选择视频模式, 该模式将应用到下面所选的每个启动项。\n"
+"请确定您的视频卡支持您所选的模式。"
 
 #: drakbug:52 drakbug:140
 #, c-format
@@ -232,7 +238,9 @@ msgstr ""
 msgid ""
 "or Application Name\n"
 "(or Full Path):"
-msgstr "应用程序名\n(或完整路径): "
+msgstr ""
+"应用程序名\n"
+"(或完整路径): "
 
 #: drakbug:103
 #, c-format
@@ -268,14 +276,18 @@ msgstr ""
 #, c-format
 msgid ""
 "To submit a bug report, click on the report button.  \n"
-"This will open a web browser window on %s where you'll find a form to fill in.  The information displayed above will be transferred to that server"
-msgstr "要提交故障报告, 单击报告按钮。\n它会打开一个浏览器窗口, 进入 %s, 那里有一个表格需要您填写。上面显示的信息将被传送到服务器"
+"This will open a web browser window on %s where you'll find a form to fill "
+"in.  The information displayed above will be transferred to that server"
+msgstr ""
+"要提交故障报告, 单击报告按钮。\n"
+"它会打开一个浏览器窗口, 进入 %s, 那里有一个表格需要您填写。上面显示的信息将被"
+"传送到服务器"
 
 #: drakbug:148
 #, c-format
 msgid ""
-"It would be very useful to attach to your report the output of the following"
-" command: %s."
+"It would be very useful to attach to your report the output of the following "
+"command: %s."
 msgid_plural ""
 "Things useful to attach to your report are the output of the following "
 "commands: %s."
@@ -316,7 +328,8 @@ msgstr "软件包未安装"
 msgid ""
 "You must type in what you were doing when this bug happened in order to "
 "enable us to reproduce this bug and to increase the odds of fixing it"
-msgstr "您必须输入在此错误发生时您正在执行的操作，以便让我们可以重现此错误并修复它。"
+msgstr ""
+"您必须输入在此错误发生时您正在执行的操作，以便让我们可以重现此错误并修复它。"
 
 #: drakbug:252
 #, c-format
@@ -368,7 +381,9 @@ msgstr "网络时间协议"
 msgid ""
 "Your computer can synchronize its clock\n"
 " with a remote time server using NTP"
-msgstr "您的计算机可以通过 NTP 协议与远程时间服\n务器的时钟同步"
+msgstr ""
+"您的计算机可以通过 NTP 协议与远程时间服\n"
+"务器的时钟同步"
 
 #: drakclock:77
 #, c-format
@@ -484,7 +499,9 @@ msgid ""
 "X11 Display Manager allows you to graphically log\n"
 "into your system with the X Window System running and supports running\n"
 "several different X sessions on your local machine at the same time."
-msgstr "X11 显示管理器允许您以图形化方式登录到您的系统, 使用 X 窗口系统和在您的本\n地机器同时跑很多个不同的 X 连接服务。"
+msgstr ""
+"X11 显示管理器允许您以图形化方式登录到您的系统, 使用 X 窗口系统和在您的本\n"
+"地机器同时跑很多个不同的 X 连接服务。"
 
 #: drakedm:74
 #, c-format
@@ -496,7 +513,9 @@ msgstr "更改已经完成, 您想要重新启动 dm 服务吗?"
 msgid ""
 "You are going to close all running programs and lose your current session. "
 "Are you really sure that you want to restart the dm service?"
-msgstr "您即将关闭运行中的全部程序, 并丢失您当前的会话。您真的确定您想要重新启动 dm 服务吗?"
+msgstr ""
+"您即将关闭运行中的全部程序, 并丢失您当前的会话。您真的确定您想要重新启动 dm "
+"服务吗?"
 
 #: drakfont:187
 #, c-format
@@ -592,10 +611,15 @@ msgstr "删除字体文件"
 #: drakfont:440
 #, c-format
 msgid ""
-"Before installing any fonts, be sure that you have the right to use and install them on your system.\n"
+"Before installing any fonts, be sure that you have the right to use and "
+"install them on your system.\n"
+"\n"
+"You can install the fonts the normal way. In rare cases, bogus fonts may "
+"hang up your X Server."
+msgstr ""
+"安装任何字体之前, 请确认您有权利在您的系统安装并使用这些字体。\n"
 "\n"
-"You can install the fonts the normal way. In rare cases, bogus fonts may hang up your X Server."
-msgstr "安装任何字体之前, 请确认您有权利在您的系统安装并使用这些字体。\n\n通常字体安装可以正常进行。但有罕见的例外, 有问题的字体会使 X 挂住。"
+"通常字体安装可以正常进行。但有罕见的例外, 有问题的字体会使 X 挂住。"
 
 #: drakfont:479
 #, c-format
@@ -652,10 +676,8 @@ msgstr "版权 (C) %s %s"
 msgid "Font installer."
 msgstr "字体安装程序。"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: drakfont:531 harddrake2:531
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
@@ -797,7 +819,8 @@ msgid ""
 " drakhelp 0.1\n"
 "Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
@@ -888,16 +911,22 @@ msgstr "编辑当前规则"
 #: drakperm:108
 #, c-format
 msgid ""
-"Here you can see files to use in order to fix permissions, owners, and groups via msec.\n"
+"Here you can see files to use in order to fix permissions, owners, and "
+"groups via msec.\n"
 "You can also edit your own rules which will overwrite the default rules."
-msgstr "您可以在此处查看权限定义文件, 以便使用 msec 来调整各种文件权限、所有者、组等。\n您还可以编辑您自己的规则以取代默认的规则。"
+msgstr ""
+"您可以在此处查看权限定义文件, 以便使用 msec 来调整各种文件权限、所有者、组"
+"等。\n"
+"您还可以编辑您自己的规则以取代默认的规则。"
 
 #: drakperm:110
 #, c-format
 msgid ""
 "The current security level is %s.\n"
 "Select permissions to see/edit"
-msgstr "当前安全级别为 %s。\n选择要查看/编辑的权限"
+msgstr ""
+"当前安全级别为 %s。\n"
+"选择要查看/编辑的权限"
 
 #: drakperm:122
 #, c-format
@@ -1012,7 +1041,9 @@ msgstr "Sticky-bit"
 msgid ""
 "Used for directory:\n"
 " only owner of directory or file in this directory can delete it"
-msgstr "用于目录:\n 只有目录的所有者或目录中文件的所有者可以删除它"
+msgstr ""
+"用于目录:\n"
+" 只有目录的所有者或目录中文件的所有者可以删除它"
 
 #: drakperm:270
 #, c-format
@@ -1069,7 +1100,9 @@ msgstr "属性"
 msgid ""
 "The first character of the path must be a slash (\"/\"):\n"
 "\"%s\""
-msgstr "路径的第一个字符必须是斜线(“/”):\n“%s”"
+msgstr ""
+"路径的第一个字符必须是斜线(“/”):\n"
+"“%s”"
 
 #: drakperm:381
 #, c-format
@@ -1261,8 +1294,7 @@ msgstr "启动"
 msgid "No Sound Card detected!"
 msgstr "没有发现声卡！"
 
-#. -PO: keep the double empty lines between sections, this is formatted a la
-#. LaTeX
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: draksound:51
 #, c-format
 msgid ""
@@ -1276,8 +1308,14 @@ msgid ""
 "\n"
 "\n"
 "\n"
-"Note: if you've an ISA PnP sound card, you'll have to use the alsaconf or the sndconfig program.  Just type \"alsaconf\" or \"sndconfig\" in a console."
-msgstr "\n\n\n注意: 如果您的声卡是 ISA 即插即用的，您需要使用 sndconfig 程序。只需在控制台中输入“alsaconf”或“sndconfig”。"
+"Note: if you've an ISA PnP sound card, you'll have to use the alsaconf or "
+"the sndconfig program.  Just type \"alsaconf\" or \"sndconfig\" in a console."
+msgstr ""
+"\n"
+"\n"
+"\n"
+"注意: 如果您的声卡是 ISA 即插即用的，您需要使用 sndconfig 程序。只需在控制台"
+"中输入“alsaconf”或“sndconfig”。"
 
 #: drakups:71
 #, c-format
@@ -1300,15 +1338,22 @@ msgid ""
 "Welcome to the UPS configuration utility.\n"
 "\n"
 "Here, you'll add a new UPS to your system.\n"
-msgstr "欢迎使用 UPS 配置工具。\n\n在这里您可以为系统添加一台新的 UPS。\n"
+msgstr ""
+"欢迎使用 UPS 配置工具。\n"
+"\n"
+"在这里您可以为系统添加一台新的 UPS。\n"
 
 #: drakups:88
 #, c-format
 msgid ""
 "We're going to add an UPS device.\n"
 "\n"
-"Do you want to autodetect UPS devices connected to this machine or to manually select them?"
-msgstr "现在即将添加 UPS 设备。\n\n您是想要自动检测连接到本机的 UPS 设备还是手动选择?"
+"Do you want to autodetect UPS devices connected to this machine or to "
+"manually select them?"
+msgstr ""
+"现在即将添加 UPS 设备。\n"
+"\n"
+"您是想要自动检测连接到本机的 UPS 设备还是手动选择?"
 
 #: drakups:91
 #, c-format
@@ -1355,7 +1400,9 @@ msgstr "制造商/型号:"
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
 "Please fill in its name, its driver and its port."
-msgstr "正在配置“%2$s”的“%1$s”。\n请填入其名称, 其驱动程序和其端口。"
+msgstr ""
+"正在配置“%2$s”的“%1$s”。\n"
+"请填入其名称, 其驱动程序和其端口。"
 
 #: drakups:143
 #, c-format
@@ -1478,8 +1525,7 @@ msgstr "欢迎使用 UPS 配置工具"
 msgid "No TV Card detected!"
 msgstr "没有发现电视卡！"
 
-#. -PO: keep the double empty lines between sections, this is formatted a la
-#. LaTeX
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: drakxtv:69
 #, c-format
 msgid ""
@@ -1527,6 +1573,18 @@ msgstr "创建加密的主分区"
 msgid "Formatting encrypted home partition"
 msgstr "格式化加密的主分区"
 
+#: finish-install:264
+#, fuzzy, c-format
+msgid "Finishing install"
+msgstr "字体安装程序。"
+
+#: finish-install:264
+#, c-format
+msgid ""
+"This system will be rebooted\n"
+"for the changes to take effect!"
+msgstr ""
+
 #: harddrake2:30
 #, c-format
 msgid "Alternative drivers"
@@ -1558,7 +1616,8 @@ msgstr "总线标识"
 msgid ""
 "- PCI and USB devices: this lists the vendor, device, subvendor and "
 "subdevice PCI/USB ids"
-msgstr "- PCI 和 USB 设备:列出 PCI/USB 的 vendor, device, subvendor 和 subdevice 代码"
+msgstr ""
+"- PCI 和 USB 设备:列出 PCI/USB 的 vendor, device, subvendor 和 subdevice 代码"
 
 #: harddrake2:39
 #, c-format
@@ -1571,7 +1630,10 @@ msgid ""
 "- pci devices: this gives the PCI slot, device and function of this card\n"
 "- eide devices: the device is either a slave or a master device\n"
 "- scsi devices: the scsi bus and the scsi device ids"
-msgstr "- pci 设备: 列出 PCI 插槽, 设备和功能\n- eide 设备: 主设备或从设备\n- scsi 设备: 列出 scsi 总线和 scsi 设备号"
+msgstr ""
+"- pci 设备: 列出 PCI 插槽, 设备和功能\n"
+"- eide 设备: 主设备或从设备\n"
+"- scsi 设备: 列出 scsi 总线和 scsi 设备号"
 
 #: harddrake2:43
 #, c-format
@@ -1805,7 +1867,9 @@ msgid ""
 "the GNU/Linux kernel needs to run a calculation loop at boot time to "
 "initialize a timer counter.  Its result is stored as bogomips as a way to "
 "\"benchmark\" the cpu."
-msgstr "GNU/Linux 核心需要在启动时运行计算循环以便初始化计时器。其结果将以 bogomips 存储, 以便作为 CPU 的衡量“基准”(Benchmark)。"
+msgstr ""
+"GNU/Linux 核心需要在启动时运行计算循环以便初始化计时器。其结果将以 bogomips "
+"存储, 以便作为 CPU 的衡量“基准”(Benchmark)。"
 
 #: harddrake2:75
 #, c-format
@@ -1848,7 +1912,8 @@ msgid ""
 "the CPU frequency in MHz (Megahertz which in first approximation may be "
 "coarsely assimilated to number of instructions the cpu is able to execute "
 "per second)"
-msgstr "以 MHz 为单位的 CPU 频率(初次估计的兆赫兹可能比较接近 CPU 每秒可执行的指令数)"
+msgstr ""
+"以 MHz 为单位的 CPU 频率(初次估计的兆赫兹可能比较接近 CPU 每秒可执行的指令数)"
 
 #: harddrake2:79
 #, c-format
@@ -1951,7 +2016,9 @@ msgid ""
 "the WP flag in the CR0 register of the cpu enforce write protection at the "
 "memory page level, thus enabling the processor to prevent unchecked kernel "
 "accesses to user memory (aka this is a bug guard)"
-msgstr "CPU 中 CRO 寄存器的 WP 标志位强制在内存页面级别进行写保护, 这使得处理器可以避免未检查的内核访问用户内存(不过此防护有 bug)"
+msgstr ""
+"CPU 中 CRO 寄存器的 WP 标志位强制在内存页面级别进行写保护, 这使得处理器可以避"
+"免未检查的内核访问用户内存(不过此防护有 bug)"
 
 #: harddrake2:97
 #, c-format
@@ -1996,7 +2063,8 @@ msgstr "逻辑单元号"
 #: harddrake2:104
 #, c-format
 msgid ""
-"the SCSI Logical Unit Number (LUN). SCSI devices connected to a host are uniquely identified by a\n"
+"the SCSI Logical Unit Number (LUN). SCSI devices connected to a host are "
+"uniquely identified by a\n"
 "channel number, a target id and a logical unit number"
 msgstr ""
 
@@ -2269,7 +2337,9 @@ msgstr "“Drak 硬件配置”帮助"
 msgid ""
 "Description of the fields:\n"
 "\n"
-msgstr "各个域的描述:\n\n"
+msgstr ""
+"各个域的描述:\n"
+"\n"
 
 #: harddrake2:548
 #, c-format
@@ -2293,8 +2363,7 @@ msgstr "Drak 语言设置"
 msgid "You should install the following packages: %s"
 msgstr "您应该安装下列软件包：%s"
 
-#. -PO: the following is used to combine packages names. eg: "initscripts,
-#. harddrake, yudit"
+#. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
 #: localedrake:49
 #, c-format
 msgid ", "
@@ -2474,7 +2543,10 @@ msgid ""
 "Welcome to the mail configuration utility.\n"
 "\n"
 "Here, you'll be able to set up the alert system.\n"
-msgstr "欢迎使用电子邮件配置工具。\n\n您可以在这里配置提醒。\n"
+msgstr ""
+"欢迎使用电子邮件配置工具。\n"
+"\n"
+"您可以在这里配置提醒。\n"
 
 #: logdrake:423
 #, c-format
@@ -2543,9 +2615,10 @@ msgstr "“%s”既不是有效的电子邮件, 也不是已存在的本地用�
 #: logdrake:459
 #, c-format
 msgid ""
-"\"%s\" is a local user, but you did not select a local smtp, so you must use"
-" a complete email address!"
-msgstr "“%s”是本地用户, 但是您没有选择本地 SMTP, 所以您必须使用完整的电子邮件地址!"
+"\"%s\" is a local user, but you did not select a local smtp, so you must use "
+"a complete email address!"
+msgstr ""
+"“%s”是本地用户, 但是您没有选择本地 SMTP, 所以您必须使用完整的电子邮件地址!"
 
 #: logdrake:466
 #, c-format
@@ -2583,7 +2656,10 @@ msgid ""
 "SANE packages need to be installed to use scanners.\n"
 "\n"
 "Do you want to install the SANE packages?"
-msgstr "要使用扫描仪, 需要安装 SANE 软件包。\n\n您想要安装 SANE 软件包吗?"
+msgstr ""
+"要使用扫描仪, 需要安装 SANE 软件包。\n"
+"\n"
+"您想要安装 SANE 软件包吗?"
 
 #: scannerdrake:53
 #, c-format
@@ -2679,8 +2755,8 @@ msgstr "扫描仪固件"
 #: scannerdrake:171 scannerdrake:223
 #, c-format
 msgid ""
-"It is possible that your %s needs its firmware to be uploaded everytime when"
-" it is turned on."
+"It is possible that your %s needs its firmware to be uploaded everytime when "
+"it is turned on."
 msgstr "很有可能您的 %s 需要每次它们启动时都上载它们的固件。"
 
 #: scannerdrake:172 scannerdrake:224
@@ -2700,7 +2776,9 @@ msgstr "要这样做的话, 您需要提供您扫描仪的固件文件, 这样�
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
 "manufacturer's home page, or on your Windows partition."
-msgstr "您可能需要在随同扫描仪的 CD 或者软盘、制造商的网站或者您的 Windows 分区中寻找它。"
+msgstr ""
+"您可能需要在随同扫描仪的 CD 或者软盘、制造商的网站或者您的 Windows 分区中寻找"
+"它。"
 
 #: scannerdrake:176 scannerdrake:235
 #, c-format
@@ -2742,8 +2820,8 @@ msgstr "很有可能您的扫描仪需要每次它们启动时都上载它们的
 #: scannerdrake:226
 #, c-format
 msgid ""
-"To do so, you need to supply the firmware files for your scanners so that it"
-" can be installed."
+"To do so, you need to supply the firmware files for your scanners so that it "
+"can be installed."
 msgstr "要这样做的话, 您需要提供您扫描仪的固件文件, 这样它就可以被安装了。"
 
 #: scannerdrake:229
@@ -2751,7 +2829,9 @@ msgstr "要这样做的话, 您需要提供您扫描仪的固件文件, 这样�
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
-msgstr "如果您已经安装了您扫描仪的固件, 您也可以通过在这里提供新固件的方式来升级固件。"
+msgstr ""
+"如果您已经安装了您扫描仪的固件, 您也可以通过在这里提供新固件的方式来升级固"
+"件。"
 
 #: scannerdrake:231
 #, c-format
@@ -2782,8 +2862,11 @@ msgstr "扫描仪 %s 不被支持"
 #, c-format
 msgid ""
 "The %s must be configured by system-config-printer.\n"
-"You can launch system-config-printer from the %s Control Center in Hardware section."
-msgstr "这个 %s 必须使用“Drak 打印机”来配置。\n您可以在“%s 控制中心”的“硬件”部分打开“Drak 打印机”。"
+"You can launch system-config-printer from the %s Control Center in Hardware "
+"section."
+msgstr ""
+"这个 %s 必须使用“Drak 打印机”来配置。\n"
+"您可以在“%s 控制中心”的“硬件”部分打开“Drak 打印机”。"
 
 #: scannerdrake:318
 #, c-format
@@ -2830,8 +2913,12 @@ msgstr "小心!"
 msgid ""
 "Your %s cannot be configured fully automatically.\n"
 "\n"
-"Manual adjustments are required. Please edit the configuration file /etc/sane.d/%s.conf. "
-msgstr "您的 %s 无法全自动进行配置。\n\n您需要手动调节。请自行编辑配置文件 /etc/sane.d/%s.conf。"
+"Manual adjustments are required. Please edit the configuration file /etc/"
+"sane.d/%s.conf. "
+msgstr ""
+"您的 %s 无法全自动进行配置。\n"
+"\n"
+"您需要手动调节。请自行编辑配置文件 /etc/sane.d/%s.conf。"
 
 #: scannerdrake:405 scannerdrake:414
 #, c-format
@@ -2843,8 +2930,8 @@ msgstr "更多信息请参看驱动程序的手册页。运行“man sane-%s”�
 #: scannerdrake:407 scannerdrake:416
 #, c-format
 msgid ""
-"After that you may scan documents using \"XSane\" or \"%s\" from "
-"Multimedia/Graphics in the applications menu."
+"After that you may scan documents using \"XSane\" or \"%s\" from Multimedia/"
+"Graphics in the applications menu."
 msgstr ""
 
 #: scannerdrake:411
@@ -2859,7 +2946,9 @@ msgstr "您的 %s 已经配置好了，但可能需要额外的手动调节才�
 msgid ""
 "If it does not appear in the list of configured scanners in the main window "
 "of Scannerdrake or if it does not work correctly, "
-msgstr "如果您没有在 ScannerDrake 主窗口的已配置扫描仪列表中找到它，或者无法正常工作，"
+msgstr ""
+"如果您没有在 ScannerDrake 主窗口的已配置扫描仪列表中找到它，或者无法正常工"
+"作，"
 
 #: scannerdrake:413
 #, c-format
@@ -2875,7 +2964,8 @@ msgstr "恭喜!"
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
-"You may now scan documents using \"XSane\" or \"%s\" from Multimedia/Graphics in the applications menu."
+"You may now scan documents using \"XSane\" or \"%s\" from Multimedia/"
+"Graphics in the applications menu."
 msgstr ""
 
 #: scannerdrake:444
@@ -2885,7 +2975,11 @@ msgid ""
 "\n"
 "%s\n"
 "are available on your system.\n"
-msgstr "下列扫描仪\n\n%s\n直接连接在您的系统。\n"
+msgstr ""
+"下列扫描仪\n"
+"\n"
+"%s\n"
+"直接连接在您的系统。\n"
 
 #: scannerdrake:445
 #, c-format
@@ -2894,7 +2988,11 @@ msgid ""
 "\n"
 "%s\n"
 "is available on your system.\n"
-msgstr "下列扫描仪\n\n%s\n直接连接在您的系统。\n"
+msgstr ""
+"下列扫描仪\n"
+"\n"
+"%s\n"
+"直接连接在您的系统。\n"
 
 #: scannerdrake:447 scannerdrake:450
 #, c-format
@@ -2944,9 +3042,11 @@ msgstr "扫描仪共享"
 #: scannerdrake:594
 #, c-format
 msgid ""
-"Here you can choose whether the scanners connected to this machine should be"
-" accessible by remote machines and by which remote machines."
-msgstr "您可以在此选择是否将连接到本机的扫描仪共享给远程计算机, 以及共享给哪些计算机。"
+"Here you can choose whether the scanners connected to this machine should be "
+"accessible by remote machines and by which remote machines."
+msgstr ""
+"您可以在此选择是否将连接到本机的扫描仪共享给远程计算机, 以及共享给哪些计算"
+"机。"
 
 #: scannerdrake:595
 #, c-format
@@ -3049,7 +3149,10 @@ msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
 "\n"
 "Do you want to install the saned package?"
-msgstr "要共享本地打印机, 必须安装 saned。\n\n您是否想要安装 saned 软件包?"
+msgstr ""
+"要共享本地打印机, 必须安装 saned。\n"
+"\n"
+"您是否想要安装 saned 软件包?"
 
 #: scannerdrake:956 scannerdrake:960
 #, c-format
@@ -3120,8 +3223,8 @@ msgstr ""
 #, c-format
 msgid ""
 "The display driver currently configured requires you to use the 'nokmsboot' "
-"boot option to prevent the KMS driver of the kernel from being loaded in the"
-" boot process. Startup of the X server may now fail as that option was not "
+"boot option to prevent the KMS driver of the kernel from being loaded in the "
+"boot process. Startup of the X server may now fail as that option was not "
 "specified."
 msgstr ""