Routine merge by l10n

1 files changed, 32 insertions, 18 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0e668290..6b6ca7dc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -71,7 +71,8 @@ msgstr "无法设置 802.1Q VLAN 参数。"
 
 #: /etc/sysconfig/network-scripts/ifup:98
 #: /etc/sysconfig/network-scripts/ifup-eth:81
-msgid "$alias device ${DEVICE} does not seem to be present, delaying initialization."
+msgid ""
+"$alias device ${DEVICE} does not seem to be present, delaying initialization."
 msgstr "$alias 设备 ${DEVICE} 似乎不在。将要推迟它的初始化。"
 
 #: /etc/rc.d/init.d/amd:91 /etc/rc.d/init.d/atd:91 /etc/rc.d/init.d/bgpd:64
@@ -1024,7 +1025,8 @@ msgstr "停止 ${NAME} 服务："
 msgid ""
 "$BASENAME error importing databases, check ${CONFIGDIRECTORY}/rpm/db_import."
 "log"
-msgstr "$BASENAME 导入数据库出错，详请检查 ${CONFIGDIRECTORY}/rpm/db_import.log"
+msgstr ""
+"$BASENAME 导入数据库出错，详请检查 ${CONFIGDIRECTORY}/rpm/db_import.log"
 
 #: /etc/rc.d/init.d/avahi-daemon:44 /etc/rc.d/init.d/avahi-daemon:46
 #: /etc/rc.d/init.d/avahi-dnsconfd:37 /etc/rc.d/init.d/avahi-dnsconfd:39
@@ -1266,8 +1268,10 @@ msgid "Shutting down kernel logger: "
 msgstr "关闭内核日志记录器："
 
 #: /etc/rc.d/init.d/puppet:90
-msgid "Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
-msgstr "用法：$0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
+msgid ""
+"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
+msgstr ""
+"用法：$0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
 
 #: /etc/rc.d/rc.sysinit:133
 msgid "Key file for $dst not found, skipping"
@@ -1352,7 +1356,8 @@ msgid "Missing parameter 'local IPv4 address' (arg 2)"
 msgstr "参数 'local IPv4 address' 不存在 (第二个参数)"
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:283
-msgid "Using 6to4 and RADVD IPv6 forwarding usually should be enabled, but it isn't"
+msgid ""
+"Using 6to4 and RADVD IPv6 forwarding usually should be enabled, but it isn't"
 msgstr "通常应该启用 6to4 和 RADVD IPv6 转送，但现在还没被启用"
 
 #: /etc/rc.d/init.d/thttpd:55
@@ -1436,7 +1441,8 @@ msgstr "启动 vbi 代理程序: "
 msgid ""
 "Device '$DEVICE' isn't supported here, use IPV6_AUTOTUNNEL setting and "
 "restart (IPv6) networking"
-msgstr "设备 '$DEVICE' 在此处不支持，使用 IPV6_AUTOTUNNEL 设置并重启 (IPv6) 联网"
+msgstr ""
+"设备 '$DEVICE' 在此处不支持，使用 IPV6_AUTOTUNNEL 设置并重启 (IPv6) 联网"
 
 #: /etc/rc.d/init.d/yum-cron:22
 msgid "Enabling nightly yum update: "
@@ -1923,7 +1929,8 @@ msgid "Usage: killproc [-p pidfile] [ -d delay] {program} [-signal]"
 msgstr "用法：killproc [-p pidfile] [ -d delay] {program} [-signal]"
 
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:194
-msgid "Utility 'ip' (package: iproute) doesn't exist or isn't executable - stop"
+msgid ""
+"Utility 'ip' (package: iproute) doesn't exist or isn't executable - stop"
 msgstr "程序'ip' (软件包: iproute)不存在或不可执行 - 停止"
 
 #: /etc/rc.d/init.d/multipathd:36
@@ -2054,8 +2061,8 @@ msgid ""
 "Usage: $0 {start|stop|switch|status|restart|condrestart|condstop|reload|"
 "force-reload}"
 msgstr ""
-"用法：$0 {start|stop|switch|status|restart|condrestart|condstop|reload|"
-"force-reload}"
+"用法：$0 {start|stop|switch|status|restart|condrestart|condstop|reload|force-"
+"reload}"
 
 #: /etc/sysconfig/network-scripts/ifup-eth:258
 msgid "Error, some other host already uses address ${IPADDR}."
@@ -2122,7 +2129,8 @@ msgstr "$FILE 出错：不可用别名数"
 msgid ""
 "$BASENAME error exporting databases, check ${CONFIGDIRECTORY}/rpm/db_export."
 "log"
-msgstr "$BASENAME 导出数据库出错，详请检查 ${CONFIGDIRECTORY}/rpm/db_export.log"
+msgstr ""
+"$BASENAME 导出数据库出错，详请检查 ${CONFIGDIRECTORY}/rpm/db_export.log"
 
 #: /etc/rc.d/init.d/tor:62
 msgid "$prog is running"
@@ -2489,7 +2497,8 @@ msgid "$prog not running"
 msgstr "$prog 没有运行"
 
 #: /etc/sysconfig/network-scripts/ifup-ppp:80
-msgid "/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist for ${DEVICE}"
+msgid ""
+"/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist for ${DEVICE}"
 msgstr "/etc/sysconfig/network-scripts/chat-${DEVNAME} 对于 ${DEVICE} 不存在"
 
 #: /etc/rc.d/init.d/arptables_jf:60
@@ -2497,8 +2506,10 @@ msgid "Clearing all current rules and user defined chains:"
 msgstr "清除所有当前规则与用户定义链："
 
 #: /etc/rc.d/init.d/postfix:115
-msgid "Usage: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
-msgstr "用法：$0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
+msgid ""
+"Usage: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
+msgstr ""
+"用法：$0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
 
 #: /etc/rc.d/init.d/udev-post:19
 msgid "Adding udev persistent rules"
@@ -3077,7 +3088,8 @@ msgid "it seems like no ucarp daemon were running:"
 msgstr "看起来没有 ucarp 程序在运行:"
 
 #: /etc/rc.d/init.d/postgresql:166
-msgid "See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
+msgid ""
+"See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
 msgstr "更多信息请见$SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist"
 
 #: /etc/rc.d/init.d/network:134 /etc/rc.d/init.d/network:145
@@ -3428,7 +3440,8 @@ msgid "Starting ConsoleKit: "
 msgstr "启动ConsoleKit: "
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:147
-msgid "Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel"
+msgid ""
+"Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel"
 msgstr "不能启用IPv6私有方法 '$IPV6_PRIVACY' ，内核不支持"
 
 #: /etc/rc.d/init.d/iscsid:27
@@ -3443,7 +3456,8 @@ msgstr "正在关闭 imapproxyd："
 msgid ""
 "Given IPv6 default gateway '$address' is link-local, but no scope or gateway "
 "device is specified"
-msgstr "指定的 IPv6 默认网关 '$address' 是本地连接的， 但是没有指定范围或网关设备"
+msgstr ""
+"指定的 IPv6 默认网关 '$address' 是本地连接的， 但是没有指定范围或网关设备"
 
 #: /etc/rc.d/init.d/cobblerd:36
 msgid "Stopping cobbler daemon: "
@@ -3649,7 +3663,8 @@ msgid "Turning off allow_ypbind SELinux boolean"
 msgstr "关闭允许_ypbind SELinux boolean"
 
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:199
-msgid "Utility 'sysctl' (package: procps) doesn't exist or isn't executable - stop"
+msgid ""
+"Utility 'sysctl' (package: procps) doesn't exist or isn't executable - stop"
 msgstr "程序'sysctl' (软件包: procps)不存在或不可执行 - 停止"
 
 #: /etc/rc.d/init.d/setroubleshoot:112
@@ -3773,4 +3788,3 @@ msgstr "停止 $prog："
 #: /etc/rc.d/init.d/audio-entropyd:28
 msgid "Shutting down Audio Entropy daemon: "
 msgstr "正在关闭音频熵守护进程："
-