routinely merge

1 files changed, 32 insertions, 17 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 070f33ad..2372dfab 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -58,7 +58,8 @@ msgstr "無法設定 802.1Q VLAN 參數。"
 #: /etc/sysconfig/network-scripts/ifup:96
 #: /etc/sysconfig/network-scripts/ifup-eth:75
 #: /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/btseed:68
@@ -100,7 +101,8 @@ msgstr "正在關閉 $MODEL: "
 
 #: /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/otrs:57
 msgid "Starting $OTRS_PROG.."
@@ -237,7 +239,8 @@ msgstr "無法載入軔體。"
 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/iscsi:28
 msgid "Setting up iSCSI targets: "
@@ -890,7 +893,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
@@ -1099,8 +1103,10 @@ msgid "Shutting down kernel logger: "
 msgstr "正在關閉核心記錄器: "
 
 #: /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): "
@@ -1163,7 +1169,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/rc.d/init.d/thttpd:57
@@ -1235,7 +1242,8 @@ msgstr "/etc/sysconfig/network-scripts/dip-$DEVICE 不存在"
 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/apt:66 /etc/rc.d/init.d/denyhosts:94
 #: /etc/rc.d/init.d/moodle:64 /etc/rc.d/init.d/puppetmaster:86
@@ -1391,7 +1399,8 @@ msgid "Usage: $0 {start|stop|restart|status}"
 msgstr "用法: $0 {start|stop|restart|status}"
 
 #: /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/radiusd:37
@@ -1528,7 +1537,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"
@@ -1754,7 +1764,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:166 /etc/rc.d/rc.sysinit.rpmsave:166
 msgid "$dst: no value for hash option, skipping"
@@ -2067,8 +2078,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:1118
 msgid "Tunnel device '$device' bringing up didn't work"
@@ -2219,7 +2232,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:90
 msgid "$named: already running"
@@ -2578,7 +2592,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:287 /etc/rc.d/rc.sysinit.rpmsave:287
@@ -2890,7 +2905,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:88
@@ -3211,4 +3227,3 @@ msgstr "第 1 個引數沒有內容，但其應該包含介面名稱 - 忽略 IP
 #: /sbin/service:64
 msgid "${SERVICE}: unrecognized service"
 msgstr "${SERVICE}: 服務未能辨識"
-