po: merge changes

Signed-off-by: Karel Zak <kzak@redhat.com>

1 files changed, 101 insertions, 93 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 361f20848..cc2d41658 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.23.1\n"
 "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2016-03-29 10:35+0200\n"
+"POT-Creation-Date: 2016-04-12 12:17+0200\n"
 "PO-Revision-Date: 2013-06-07 23:29+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -43,7 +43,7 @@ msgstr ""
 #: lib/path.c:70 lib/path.c:82 login-utils/islocal.c:87 login-utils/last.c:653
 #: login-utils/sulogin.c:480 login-utils/sulogin.c:517
 #: login-utils/utmpdump.c:126 login-utils/utmpdump.c:348
-#: login-utils/utmpdump.c:370 login-utils/vipw.c:255 login-utils/vipw.c:273
+#: login-utils/utmpdump.c:370 login-utils/vipw.c:258 login-utils/vipw.c:276
 #: misc-utils/findmnt.c:1121 misc-utils/logger.c:1180 misc-utils/mcookie.c:115
 #: misc-utils/uuidd.c:207 sys-utils/blkdiscard.c:183 sys-utils/dmesg.c:522
 #: sys-utils/eject.c:500 sys-utils/eject.c:700 sys-utils/fallocate.c:374
@@ -55,8 +55,8 @@ msgstr ""
 #: sys-utils/rtcwake.c:269 sys-utils/setpriv.c:230 sys-utils/setpriv.c:529
 #: sys-utils/setpriv.c:552 sys-utils/swapon.c:371 sys-utils/swapon.c:514
 #: sys-utils/switch_root.c:163 sys-utils/unshare.c:106 sys-utils/unshare.c:121
-#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/agetty.c:2616
-#: term-utils/agetty.c:2640 term-utils/mesg.c:127 term-utils/script.c:420
+#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377 term-utils/agetty.c:2615
+#: term-utils/agetty.c:2639 term-utils/mesg.c:127 term-utils/script.c:420
 #: term-utils/script.c:426 term-utils/script.c:428 term-utils/script.c:516
 #: term-utils/scriptreplay.c:206 term-utils/scriptreplay.c:209
 #: term-utils/wall.c:331 text-utils/colcrt.c:275 text-utils/more.c:518
@@ -1676,15 +1676,15 @@ msgstr "使用者名稱"
 msgid "Entering nested BSD disklabel."
 msgstr "建立新的 Sun disklabel。\n"
 
-#: disk-utils/fdisk-menu.c:955
+#: disk-utils/fdisk-menu.c:954
 msgid "Number of cylinders"
 msgstr "磁柱數量"
 
-#: disk-utils/fdisk-menu.c:959
+#: disk-utils/fdisk-menu.c:958
 msgid "Number of heads"
 msgstr "磁頭數量"
 
-#: disk-utils/fdisk-menu.c:963
+#: disk-utils/fdisk-menu.c:962
 msgid "Number of sectors"
 msgstr "磁區數量"
 
@@ -1762,7 +1762,7 @@ msgid "%s: failed to parse fstab"
 msgstr "%s：無法剖析 fstab"
 
 #: disk-utils/fsck.c:679 login-utils/login.c:967 login-utils/sulogin.c:1063
-#: login-utils/vipw.c:203 sys-utils/flock.c:326 sys-utils/nsenter.c:151
+#: login-utils/vipw.c:204 sys-utils/flock.c:326 sys-utils/nsenter.c:151
 #: sys-utils/swapon.c:316 sys-utils/unshare.c:219 sys-utils/unshare.c:420
 #: term-utils/script.c:774
 msgid "fork failed"
@@ -4748,8 +4748,8 @@ msgstr ""
 "\n"
 "以獲得更多細節參看 %s。\n"
 
-#: include/closestream.h:42 include/closestream.h:44 login-utils/vipw.c:270
-#: login-utils/vipw.c:289 sys-utils/rtcwake.c:279 term-utils/setterm.c:813
+#: include/closestream.h:42 include/closestream.h:44 login-utils/vipw.c:273
+#: login-utils/vipw.c:292 sys-utils/rtcwake.c:279 term-utils/setterm.c:813
 #: text-utils/col.c:157
 #, fuzzy
 msgid "write error"
@@ -8289,7 +8289,7 @@ msgstr ""
 " -e, --force              檢查密碼檔案直接如果 getpwnam (3) 失敗\n"
 
 #: login-utils/sulogin.c:900 misc-utils/findmnt.c:1472 sys-utils/wdctl.c:523
-#: term-utils/wall.c:135
+#: term-utils/agetty.c:754 term-utils/wall.c:135
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "無效的逾時引數"
@@ -8408,41 +8408,41 @@ msgstr "無法提取語境用於 %s"
 msgid "Can't set context for %s"
 msgstr "無法設定語境用於 %s"
 
-#: login-utils/vipw.c:235
+#: login-utils/vipw.c:236
 #, fuzzy, c-format
 msgid "%s unchanged"
 msgstr "%s 未變更"
 
-#: login-utils/vipw.c:251
+#: login-utils/vipw.c:254
 #, fuzzy
 msgid "cannot get lock"
 msgstr "無法提取鎖定"
 
-#: login-utils/vipw.c:278
+#: login-utils/vipw.c:281
 #, fuzzy
 msgid "no changes made"
 msgstr "沒有變更所做"
 
-#: login-utils/vipw.c:287
+#: login-utils/vipw.c:290
 #, fuzzy
 msgid "cannot chmod file"
 msgstr "無法 chmod 檔案"
 
-#: login-utils/vipw.c:301
+#: login-utils/vipw.c:304
 msgid "Edit the password or group file.\n"
 msgstr ""
 
-#: login-utils/vipw.c:347
+#: login-utils/vipw.c:350
 msgid "You are using shadow groups on this system.\n"
 msgstr "您正在這個系統中使用陰影群組。\n"
 
-#: login-utils/vipw.c:348
+#: login-utils/vipw.c:351
 msgid "You are using shadow passwords on this system.\n"
 msgstr "您正在這個系統中使用陰影密碼。\n"
 
 #. TRANSLATORS: this program uses for y and n rpmatch(3),
 #. * which means they can be translated.
-#: login-utils/vipw.c:352
+#: login-utils/vipw.c:355
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "您現在想要編輯 %s 嗎[y/n]？"
@@ -9116,7 +9116,7 @@ msgid "%s and %s are mutually exclusive"
 msgstr "彼此互斥。"
 
 #: misc-utils/kill.c:396 misc-utils/kill.c:438 misc-utils/rename.c:174
-#: sys-utils/ipcrm.c:160 term-utils/agetty.c:794 term-utils/agetty.c:803
+#: sys-utils/ipcrm.c:160 term-utils/agetty.c:793 term-utils/agetty.c:802
 #, fuzzy
 msgid "not enough arguments"
 msgstr "不足引數"
@@ -17867,118 +17867,123 @@ msgstr "%s：無法變更處理優先權：%m"
 msgid "%s: can't exec %s: %m"
 msgstr "%s：無法 exec %s: %m"
 
-#: term-utils/agetty.c:559 term-utils/agetty.c:846 term-utils/agetty.c:858
-#: term-utils/agetty.c:1415 term-utils/agetty.c:1433 term-utils/agetty.c:1468
-#: term-utils/agetty.c:1478 term-utils/agetty.c:1515 term-utils/agetty.c:1975
-#: term-utils/agetty.c:2509
+#: term-utils/agetty.c:559 term-utils/agetty.c:845 term-utils/agetty.c:857
+#: term-utils/agetty.c:1414 term-utils/agetty.c:1432 term-utils/agetty.c:1467
+#: term-utils/agetty.c:1477 term-utils/agetty.c:1514 term-utils/agetty.c:1974
+#: term-utils/agetty.c:2508
 #, fuzzy, c-format
 msgid "failed to allocate memory: %m"
 msgstr "配置記憶體時失敗：%m"
 
+#: term-utils/agetty.c:684
+#, fuzzy
+msgid "invalid delay argument"
+msgstr "無效的前端引數"
+
 #: term-utils/agetty.c:723
 #, fuzzy
 msgid "invalid argument of --local-line"
 msgstr "無效的引數到 --auto /-a 選項"
 
-#: term-utils/agetty.c:755
-#, c-format
-msgid "bad timeout value: %s"
-msgstr "不當的逾時設定值：%s"
+#: term-utils/agetty.c:742
+#, fuzzy
+msgid "invalid nice argument"
+msgstr "無效的時間引數"
 
-#: term-utils/agetty.c:876
+#: term-utils/agetty.c:875
 #, c-format
 msgid "bad speed: %s"
 msgstr "不當的速度：%s"
 
-#: term-utils/agetty.c:878
+#: term-utils/agetty.c:877
 msgid "too many alternate speeds"
 msgstr "太多交替速度"
 
-#: term-utils/agetty.c:1006 term-utils/agetty.c:1010 term-utils/agetty.c:1063
+#: term-utils/agetty.c:1005 term-utils/agetty.c:1009 term-utils/agetty.c:1062
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: 無法開啟為標準輸入：%m"
 
-#: term-utils/agetty.c:1029
+#: term-utils/agetty.c:1028
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: 不是字元裝置"
 
-#: term-utils/agetty.c:1031
+#: term-utils/agetty.c:1030
 #, fuzzy, c-format
 msgid "/dev/%s: not a tty"
 msgstr "%s：不是 tty"
 
-#: term-utils/agetty.c:1035 term-utils/agetty.c:1067
+#: term-utils/agetty.c:1034 term-utils/agetty.c:1066
 #, fuzzy, c-format
 msgid "/dev/%s: cannot get controlling tty: %m"
 msgstr "/dev/%s: 無法開啟為標準輸入：%m"
 
-#: term-utils/agetty.c:1057
+#: term-utils/agetty.c:1056
 #, fuzzy, c-format
 msgid "/dev/%s: vhangup() failed: %m"
 msgstr "%s：calloc() 失敗：%s\n"
 
-#: term-utils/agetty.c:1078
+#: term-utils/agetty.c:1077
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s：無法開啟用於讀取/寫入"
 
-#: term-utils/agetty.c:1083
+#: term-utils/agetty.c:1082
 #, fuzzy, c-format
 msgid "/dev/%s: cannot set process group: %m"
 msgstr "%s：無法變更處理優先權：%m"
 
-#: term-utils/agetty.c:1097
+#: term-utils/agetty.c:1096
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s：dup 問題：%m"
 
-#: term-utils/agetty.c:1114
+#: term-utils/agetty.c:1113
 #, fuzzy, c-format
 msgid "%s: failed to get terminal attributes: %m"
 msgstr "無法取得終端機屬性用於 %s"
 
-#: term-utils/agetty.c:1321 term-utils/agetty.c:1341
+#: term-utils/agetty.c:1320 term-utils/agetty.c:1340
 #, fuzzy, c-format
 msgid "setting terminal attributes failed: %m"
 msgstr "無法設定終端機屬性用於 %s"
 
-#: term-utils/agetty.c:1458
+#: term-utils/agetty.c:1457
 #, fuzzy
 msgid "cannot open os-release file"
 msgstr "無法開啟鎖定檔案 %s"
 
-#: term-utils/agetty.c:1636
+#: term-utils/agetty.c:1635
 #, fuzzy, c-format
 msgid "failed to create reload file: %s: %m"
 msgstr "讀取 typescript 檔案 %s 時失敗"
 
-#: term-utils/agetty.c:1733
+#: term-utils/agetty.c:1732
 msgid "[press ENTER to login]"
 msgstr ""
 
-#: term-utils/agetty.c:1757
+#: term-utils/agetty.c:1756
 #, fuzzy
 msgid "Num Lock off"
 msgstr "Num 鎖定關閉"
 
-#: term-utils/agetty.c:1760
+#: term-utils/agetty.c:1759
 #, fuzzy
 msgid "Num Lock on"
 msgstr "Num 鎖定開"
 
-#: term-utils/agetty.c:1763
+#: term-utils/agetty.c:1762
 #, fuzzy
 msgid "Caps Lock on"
 msgstr "大寫鍵開"
 
-#: term-utils/agetty.c:1766
+#: term-utils/agetty.c:1765
 #, fuzzy
 msgid "Scroll Lock on"
 msgstr "捲動鎖定開"
 
-#: term-utils/agetty.c:1769
+#: term-utils/agetty.c:1768
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
@@ -17987,32 +17992,32 @@ msgstr ""
 "提示：%s\n"
 "\n"
 
-#: term-utils/agetty.c:1896
+#: term-utils/agetty.c:1895
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s：讀取：%m"
 
-#: term-utils/agetty.c:1955
+#: term-utils/agetty.c:1954
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s：輸入超出"
 
-#: term-utils/agetty.c:1971 term-utils/agetty.c:1979
+#: term-utils/agetty.c:1970 term-utils/agetty.c:1978
 #, c-format
 msgid "%s: invalid character conversion for login name"
 msgstr ""
 
-#: term-utils/agetty.c:1985
+#: term-utils/agetty.c:1984
 #, c-format
 msgid "%s: invalid character 0x%x in login name"
 msgstr ""
 
-#: term-utils/agetty.c:2070
+#: term-utils/agetty.c:2069
 #, fuzzy, c-format
 msgid "%s: failed to set terminal attributes: %m"
 msgstr "無法設定終端機屬性用於 %s"
 
-#: term-utils/agetty.c:2106
+#: term-utils/agetty.c:2105
 #, fuzzy, c-format
 msgid ""
 " %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n"
@@ -18023,185 +18028,185 @@ msgstr ""
 " %1$s [選項] 列 baud_rate ,...[termtype]\n"
 " %1$s [選項] baud_rate ,...列 [termtype]\n"
 
-#: term-utils/agetty.c:2110
+#: term-utils/agetty.c:2109
 msgid "Open a terminal and set its mode.\n"
 msgstr ""
 
-#: term-utils/agetty.c:2113
+#: term-utils/agetty.c:2112
 #, fuzzy
 msgid " -8, --8bits                assume 8-bit tty\n"
 msgstr " -s, --status                 查詢印表機狀態\n"
 
-#: term-utils/agetty.c:2114
+#: term-utils/agetty.c:2113
 msgid " -a, --autologin <user>     login the specified user automatically\n"
 msgstr ""
 
-#: term-utils/agetty.c:2115
+#: term-utils/agetty.c:2114
 #, fuzzy
 msgid " -c, --noreset              do not reset control mode\n"
 msgstr " -r, --reset                  重置通訊埠\n"
 
-#: term-utils/agetty.c:2116
+#: term-utils/agetty.c:2115
 #, fuzzy
 msgid " -E, --remote               use -r <hostname> for login(1)\n"
 msgstr " -r, --reset               重置所有計數器 (只限 root)\n"
 
-#: term-utils/agetty.c:2117
+#: term-utils/agetty.c:2116
 #, fuzzy
 msgid " -f, --issue-file <file>    display issue file\n"
 msgstr " -h, --help     顯示這份說明然後離開\n"
 
-#: term-utils/agetty.c:2118
+#: term-utils/agetty.c:2117
 msgid " -h, --flow-control         enable hardware flow control\n"
 msgstr ""
 
-#: term-utils/agetty.c:2119
+#: term-utils/agetty.c:2118
 #, fuzzy
 msgid " -H, --host <hostname>      specify login host\n"
 msgstr " -s, --shell <shell>  指定登入命令殼\n"
 
-#: term-utils/agetty.c:2120
+#: term-utils/agetty.c:2119
 #, fuzzy
 msgid " -i, --noissue              do not display issue file\n"
 msgstr " -q, --stats                        顯示統計關於 tty\n"
 
-#: term-utils/agetty.c:2121
+#: term-utils/agetty.c:2120
 msgid " -I, --init-string <string> set init string\n"
 msgstr ""
 
-#: term-utils/agetty.c:2122
+#: term-utils/agetty.c:2121
 #, fuzzy
 msgid " -J  --noclear              do not clear the screen before prompt\n"
 msgstr " -c           清空螢幕之前顯示\n"
 
-#: term-utils/agetty.c:2123
+#: term-utils/agetty.c:2122
 msgid " -l, --login-program <file> specify login program\n"
 msgstr ""
 
-#: term-utils/agetty.c:2124
+#: term-utils/agetty.c:2123
 #, fuzzy
 msgid " -L, --local-line[=<mode>]  control the local line flag\n"
 msgstr " -u  --unlock             移除鎖定\n"
 
-#: term-utils/agetty.c:2125
+#: term-utils/agetty.c:2124
 msgid " -m, --extract-baud         extract baud rate during connect\n"
 msgstr ""
 
-#: term-utils/agetty.c:2126
+#: term-utils/agetty.c:2125
 #, fuzzy
 msgid " -n, --skip-login           do not prompt for login\n"
 msgstr " -f           不分割長列\n"
 
-#: term-utils/agetty.c:2127
+#: term-utils/agetty.c:2126
 #, fuzzy
 msgid " -N  --nonewline            do not print a newline before issue\n"
 msgstr " -e           不暫停於結束的檔案\n"
 
-#: term-utils/agetty.c:2128
+#: term-utils/agetty.c:2127
 #, fuzzy
 msgid " -o, --login-options <opts> options that are passed to login\n"
 msgstr " -l, --longoptions <longopts> 長選項為辨識的\n"
 
-#: term-utils/agetty.c:2129
+#: term-utils/agetty.c:2128
 #, fuzzy
 msgid " -p, --login-pause          wait for any key before the login\n"
 msgstr " -f           不分割長列\n"
 
-#: term-utils/agetty.c:2130
+#: term-utils/agetty.c:2129
 #, fuzzy
 msgid " -r, --chroot <dir>         change root to the directory\n"
 msgstr " -a, --abort <on|off>         放棄於錯誤\n"
 
-#: term-utils/agetty.c:2131
+#: term-utils/agetty.c:2130
 #, fuzzy
 msgid " -R, --hangup               do virtually hangup on the tty\n"
 msgstr " -u, --unquote                不引言輸出\n"
 
-#: term-utils/agetty.c:2132
+#: term-utils/agetty.c:2131
 #, fuzzy
 msgid " -s, --keep-baud            try to keep baud rate after break\n"
 msgstr " -d, --debug             列印詳細的訊息到標準勘誤\n"
 
-#: term-utils/agetty.c:2133
+#: term-utils/agetty.c:2132
 msgid " -t, --timeout <number>     login process timeout\n"
 msgstr ""
 
-#: term-utils/agetty.c:2134
+#: term-utils/agetty.c:2133
 msgid " -U, --detect-case          detect uppercase terminal\n"
 msgstr ""
 
-#: term-utils/agetty.c:2135
+#: term-utils/agetty.c:2134
 #, fuzzy
 msgid " -w, --wait-cr              wait carriage-return\n"
 msgstr " -w, --wait <us>              strobe 等待在中 micro 秒\n"
 
-#: term-utils/agetty.c:2136
+#: term-utils/agetty.c:2135
 #, fuzzy
 msgid "     --nohints              do not print hints\n"
 msgstr " -f           不分割長列\n"
 
-#: term-utils/agetty.c:2137
+#: term-utils/agetty.c:2136
 #, fuzzy
 msgid "     --nohostname           no hostname at all will be shown\n"
 msgstr " -e           不暫停於結束的檔案\n"
 
-#: term-utils/agetty.c:2138
+#: term-utils/agetty.c:2137
 msgid "     --long-hostname        show full qualified hostname\n"
 msgstr ""
 
-#: term-utils/agetty.c:2139
+#: term-utils/agetty.c:2138
 msgid "     --erase-chars <string> additional backspace chars\n"
 msgstr ""
 
-#: term-utils/agetty.c:2140
+#: term-utils/agetty.c:2139
 msgid "     --kill-chars <string>  additional kill chars\n"
 msgstr ""
 
-#: term-utils/agetty.c:2141
+#: term-utils/agetty.c:2140
 msgid "     --chdir <directory>    chdir before the login\n"
 msgstr ""
 
-#: term-utils/agetty.c:2142
+#: term-utils/agetty.c:2141
 #, fuzzy
 msgid "     --delay <number>       sleep seconds before prompt\n"
 msgstr " -c           清空螢幕之前顯示\n"
 
-#: term-utils/agetty.c:2143
+#: term-utils/agetty.c:2142
 msgid "     --nice <number>        run login with this priority\n"
 msgstr ""
 
-#: term-utils/agetty.c:2144
+#: term-utils/agetty.c:2143
 #, fuzzy
 msgid "     --reload               reload prompts on running agetty instances\n"
 msgstr " -f           不分割長列\n"
 
-#: term-utils/agetty.c:2145
+#: term-utils/agetty.c:2144
 #, fuzzy
 msgid "     --help                 display this help and exit\n"
 msgstr " -h           顯示這份說明然後離開\n"
 
-#: term-utils/agetty.c:2146
+#: term-utils/agetty.c:2145
 #, fuzzy
 msgid "     --version              output version information and exit\n"
 msgstr " -V           輸出版本資訊然後離開\n"
 
-#: term-utils/agetty.c:2469
+#: term-utils/agetty.c:2468
 #, fuzzy, c-format
 msgid "%d user"
 msgid_plural "%d users"
 msgstr[0] "使用者"
 
-#: term-utils/agetty.c:2597
+#: term-utils/agetty.c:2596
 #, fuzzy, c-format
 msgid "checkname failed: %m"
 msgstr "chown 失敗：%s"
 
-#: term-utils/agetty.c:2643
+#: term-utils/agetty.c:2642
 #, fuzzy, c-format
 msgid "cannot touch file %s"
 msgstr "無法關閉檔案 %s"
 
-#: term-utils/agetty.c:2647
+#: term-utils/agetty.c:2646
 msgid "--reload is unsupported on your system"
 msgstr ""
 
@@ -19578,6 +19583,9 @@ msgstr "不明的退出序列在中輸入：%o，%o"
 msgid "Input line too long."
 msgstr "輸入列太長。"
 
+#~ msgid "bad timeout value: %s"
+#~ msgstr "不當的逾時設定值：%s"
+
 #, fuzzy
 #~ msgid "%s: parse error at line %d"
 #~ msgstr "%s：剖析錯誤於列 %d"