routine merge

1 files changed, 22 insertions, 12 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3dccbc27..ce8ab70c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -43,7 +43,8 @@ msgstr "正在重新載入 cron 系統程式的組態設定:"
 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: "
@@ -55,7 +56,8 @@ msgstr "無法設定 802.1Q VLAN 參數。"
 
 #: /etc/sysconfig/network-scripts/ifup:94
 #: /etc/sysconfig/network-scripts/ifup-eth:56
-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/autofs:618
@@ -109,7 +111,8 @@ msgstr "正在關閉 $MODEL:"
 
 #: /etc/sysconfig/network-scripts/ifup-ppp:142
 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:70
 msgid "Shutting down NIS services: "
@@ -1044,7 +1047,8 @@ msgid "Missing parameter 'local IPv4 address' (arg 2)"
 msgstr "遺失參數 'local IPv4 address' (arg 2)"
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:277
-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:57
@@ -1104,7 +1108,8 @@ msgstr "正在卸載 GFS 檔案系統（懶惰方式）: "
 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:22
 msgid "Enabling nightly yum update: "
@@ -1270,7 +1275,8 @@ msgid "Usage: $0 {start|stop|restart|status}"
 msgstr "用法: $0 {start|stop|restart|status}"
 
 #: /etc/sysconfig/network-scripts/ifup-ppp:81
-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/radiusd:37
@@ -1394,7 +1400,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-ipv6:199
 msgid "Given IPv4 address '$ipv4addr' is not globally usable"
@@ -1882,8 +1889,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:1089
 msgid "Tunnel device '$device' bringing up didn't work"
@@ -2027,7 +2036,8 @@ msgstr ""
 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:52
 msgid "$named: already running"
@@ -2358,7 +2368,8 @@ msgid "Stopping $type $name: "
 msgstr "正在停止 $type $name: "
 
 #: /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:141
@@ -2915,4 +2926,3 @@ msgstr "重新載入 $base"
 #: /etc/rc.d/init.d/wpa_supplicant:43 /etc/rc.d/init.d/xinetd:68
 msgid "Stopping $prog: "
 msgstr "正在停止 $prog: "
-