Routine merge by l10n

2 files changed, 71 insertions, 37 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b6b3634f..bf7688f6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -65,7 +65,8 @@ msgstr "无法设置 802.1Q VLAN 参数。"
 #: /etc/sysconfig/network-scripts/ifup-eth:75
 #: /etc/sysconfig/network-scripts/ifup:96
 #: /etc/sysconfig/network-scripts/ifup-eth.rpmsave:76
-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:92 /etc/rc.d/init.d/bgpd:59 /etc/rc.d/init.d/irda:71
@@ -814,7 +815,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:39 /etc/rc.d/init.d/avahi-daemon:41
 #: /etc/rc.d/init.d/avahi-dnsconfd:34 /etc/rc.d/init.d/avahi-dnsconfd:36
@@ -1074,7 +1076,8 @@ msgid "Missing parameter 'local IPv4 address' (arg 2)"
 msgstr "参数 'local IPv4 address' 不存在 (第二个参数)"
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:287
-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/sysconfig/network-scripts/network-functions-ipv6:285
@@ -1163,7 +1166,8 @@ msgstr "设置网络参数... "
 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/sysconfig/network-scripts/network-functions-ipv6:869
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:851
@@ -1602,7 +1606,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/rc.sysinit:169 /etc/rc.d/rc.sysinit:166
 #: /etc/rc.d/rc.sysinit.rpmsave:166
@@ -1904,7 +1909,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
@@ -1912,8 +1918,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/sysconfig/network-scripts/network-functions-ipv6:1136
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:1118
@@ -2381,7 +2389,8 @@ msgid "Reloading $prog daemon configuration: "
 msgstr "重新载入 $prog 守护进程配置："
 
 #: /etc/rc.d/init.d/postgresql:162
-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/rc.sysinit:296 /etc/rc.d/rc.sysinit:287
@@ -2652,7 +2661,8 @@ msgid "WARNING: vconfig not able to disable REORDER_HDR on ${DEVICE}"
 msgstr "警告: vconfig 不能在 ${DEVICE} 上禁用 REORDER_HDR"
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:151
-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/nfslock:91 /etc/rc.d/init.d/nfslock:88
@@ -2664,7 +2674,8 @@ msgstr "停止 NFS 锁定："
 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/nfslock:96 /etc/rc.d/init.d/nfslock:93
 msgid "Stopping NFS statd: "
@@ -2703,10 +2714,12 @@ msgstr "6to4 配置无效"
 msgid ""
 "ERROR: [ipv6_log] Syslog is chosen, but binary 'logger' doesn't exist or "
 "isn't executable"
-msgstr "错误：选择了 [ipv6_log] 系统日志，但执行文件“logger”不存在或者不可执行。"
+msgstr ""
+"错误：选择了 [ipv6_log] 系统日志，但执行文件“logger”不存在或者不可执行。"
 
 #: /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/ip6tables:200
@@ -2820,7 +2833,8 @@ msgid "Automatic reboot in progress."
 msgstr "自动重启正在运行中。"
 
 #: /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
@@ -3100,8 +3114,10 @@ msgid "Starting openvpn: "
 msgstr "正在启动 openvpn："
 
 #: /etc/rc.d/init.d/puppet:84
-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/init.d/ups:48
 msgid "Starting UPS monitor (master): "
@@ -3551,4 +3567,3 @@ msgstr "正在启用每晚的 apt 更新："
 #: /etc/rc.d/init.d/moodle:56
 msgid "Moodle cron job is enabled."
 msgstr "进程记帐已被启动。"
-
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2c8c880f..57a9ab45 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -44,7 +44,8 @@ msgstr "$BASENAME 正在匯出資料庫"
 msgid ""
 "Warning: configured MTU '$IPV6TO4_MTU' for 6to4 exceeds maximum limit of "
 "'$tunnelmtu', ignored"
-msgstr "警告: 為 6to4 設定的 MTU '$IPV6TO4_MTU' 超過 '$tunnelmtu' 最大限制，已忽略"
+msgstr ""
+"警告: 為 6to4 設定的 MTU '$IPV6TO4_MTU' 超過 '$tunnelmtu' 最大限制，已忽略"
 
 #: /etc/rc.d/init.d/ypxfrd:31
 msgid "Stopping YP map server: "
@@ -59,7 +60,8 @@ msgstr "無法設定 802.1Q VLAN 參數。"
 #: /etc/sysconfig/network-scripts/ifup-eth:75
 #: /etc/sysconfig/network-scripts/ifup:96
 #: /etc/sysconfig/network-scripts/ifup-eth.rpmsave:76
-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:92 /etc/rc.d/init.d/bgpd:59 /etc/rc.d/init.d/irda:71
@@ -89,7 +91,8 @@ msgstr "正在重新載入 INN 服務: "
 
 #: /etc/sysconfig/network-scripts/ifup-ppp:145
 msgid "pppd started for ${DEVNAME} on ${MODEMPORT} at ${LINESPEED}"
-msgstr "pppd 已於 ${DEVNAME} 裝置的 ${MODEMPORT} 連接埠上以 ${LINESPEED} 的速度啟動"
+msgstr ""
+"pppd 已於 ${DEVNAME} 裝置的 ${MODEMPORT} 連接埠上以 ${LINESPEED} 的速度啟動"
 
 #: /etc/rc.d/init.d/ypbind:98 /etc/rc.d/init.d/ypbind:72
 msgid "Shutting down NIS services: "
@@ -808,7 +811,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:39 /etc/rc.d/init.d/avahi-daemon:41
 #: /etc/rc.d/init.d/avahi-dnsconfd:34 /etc/rc.d/init.d/avahi-dnsconfd:36
@@ -1068,7 +1072,8 @@ msgid "Missing parameter 'local IPv4 address' (arg 2)"
 msgstr "缺少參數 'local IPv4 address' (arg 2)"
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:287
-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/sysconfig/network-scripts/network-functions-ipv6:285
@@ -1157,7 +1162,8 @@ msgstr "正在設定網路參數... "
 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/sysconfig/network-scripts/network-functions-ipv6:869
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:851
@@ -1367,7 +1373,8 @@ msgstr "發送啟動訊息到 radvd 時，不支援 '$mechanism' 機制"
 msgid ""
 "Usage: $0 {start|stop|status|restart|condrestart|condstop|reload|force-"
 "reload}"
-msgstr "用法：$0 {start|stop|status|restart|condrestart|condstop|reload|force-reload}"
+msgstr ""
+"用法：$0 {start|stop|status|restart|condrestart|condstop|reload|force-reload}"
 
 #: /etc/sysconfig/network-scripts/ifup-sl:47
 msgid "/etc/sysconfig/network-scripts/dip-$DEVICE does not exist for $DEVICE"
@@ -1594,7 +1601,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/rc.sysinit:169 /etc/rc.d/rc.sysinit:166
 #: /etc/rc.d/rc.sysinit.rpmsave:166
@@ -1896,7 +1904,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 "${DEVICE} 的 /etc/sysconfig/network-scripts/chat-${DEVNAME} 不存在"
 
 #: /etc/rc.d/init.d/arptables_jf:60
@@ -1904,8 +1913,10 @@ msgid "Clearing all current rules and user defined chains:"
 msgstr "正在清除所有目前的規則與使用者定義的鏈（chain）:"
 
 #: /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/sysconfig/network-scripts/network-functions-ipv6:1136
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:1118
@@ -2054,7 +2065,8 @@ msgstr "正在停止所有 ${MODULE_NAME} 驅動程式: "
 msgid ""
 "On given address '$testipv6addr_valid' the prefix length is out of range "
 "(valid: 0-128)"
-msgstr "提供的位址 '$testipv6addr_valid' 中，前置字元長度超出範圍（有效範圍： 0-128）"
+msgstr ""
+"提供的位址 '$testipv6addr_valid' 中，前置字元長度超出範圍（有效範圍： 0-128）"
 
 #: /etc/rc.d/init.d/named:94 /etc/rc.d/init.d/named:90
 msgid "$named: already running"
@@ -2373,7 +2385,8 @@ msgid "Reloading $prog daemon configuration: "
 msgstr "正在重新載入 $prog 系統程式的組態設定: "
 
 #: /etc/rc.d/init.d/postgresql:162
-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/rc.sysinit:296 /etc/rc.d/rc.sysinit:287
@@ -2644,7 +2657,8 @@ msgid "WARNING: vconfig not able to disable REORDER_HDR on ${DEVICE}"
 msgstr "警告：vconfig 無法停用 ${DEVICE} 裝置上的 REORDER_HDR"
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:151
-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/nfslock:91 /etc/rc.d/init.d/nfslock:88
@@ -2697,10 +2711,13 @@ msgstr "6to4 組態設定無效"
 msgid ""
 "ERROR: [ipv6_log] Syslog is chosen, but binary 'logger' doesn't exist or "
 "isn't executable"
-msgstr "錯誤：[ipv6_log] 已選擇 syslog，但二進位程式「logger」並不存在，或不是可執行檔"
+msgstr ""
+"錯誤：[ipv6_log] 已選擇 syslog，但二進位程式「logger」並不存在，或不是可執行"
+"檔"
 
 #: /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/ip6tables:200
@@ -2814,7 +2831,8 @@ msgid "Automatic reboot in progress."
 msgstr "正在自動重新開機。"
 
 #: /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
@@ -3092,8 +3110,10 @@ msgid "Starting openvpn: "
 msgstr "正在啟動 openvpn: "
 
 #: /etc/rc.d/init.d/puppet:84
-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/init.d/ups:48
 msgid "Starting UPS monitor (master): "
@@ -3543,4 +3563,3 @@ msgstr "正在啟用每晚的 apt 更新: "
 #: /etc/rc.d/init.d/moodle:56
 msgid "Moodle cron job is enabled."
 msgstr "已啟用 Moodle cron 工作。"
-