Make --allow-admin the default.

1 files changed, 86 insertions, 85 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index a857f4469..a54807ca7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.10rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-01-19 16:21+0100\n"
+"POT-Creation-Date: 2009-01-28 14:11+0100\n"
 "PO-Revision-Date: 2008-12-10 22:48+0800\n"
 "Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -102,7 +102,7 @@ msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:754
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2743
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
@@ -408,18 +408,18 @@ msgstr "給定的除錯等級 `%s' 無效\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: agent/gpg-agent.c:656 g10/gpg.c:2086 scd/scdaemon.c:466 sm/gpgsm.c:971
+#: agent/gpg-agent.c:656 g10/gpg.c:2086 scd/scdaemon.c:467 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
 #: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2090
-#: scd/scdaemon.c:471 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: scd/scdaemon.c:472 sm/gpgsm.c:975 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:669 g10/gpg.c:2097 scd/scdaemon.c:479 sm/gpgsm.c:982
+#: agent/gpg-agent.c:669 g10/gpg.c:2097 scd/scdaemon.c:480 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項中\n"
@@ -432,16 +432,16 @@ msgstr "建立 `%s' 時出錯: %s\n"
 
 #: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
 #: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:971
+#: g10/openfile.c:429 scd/scdaemon.c:973
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:987
 msgid "name of socket too long\n"
 msgstr "socket 名稱太長\n"
 
-#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1010
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
@@ -455,21 +455,21 @@ msgstr "socket 名稱 `%s' 太長\n"
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 
-#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1030
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket 取得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1033
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "綁定 socket 至 `%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1042
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() 失敗: %s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1049
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在候聽 socket `%s'\n"
@@ -489,7 +489,7 @@ msgstr "stat() 失敗於 `%s': %s\n"
 msgid "can't use `%s' as home directory\n"
 msgstr "無法使用 `%s' 做為家目錄\n"
 
-#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1065
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
@@ -514,12 +514,12 @@ msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1860 scd/scdaemon.c:1200
+#: agent/gpg-agent.c:1860 scd/scdaemon.c:1202
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select 失敗: %s - 等 1 秒鐘\n"
 
-#: agent/gpg-agent.c:1969 scd/scdaemon.c:1267
+#: agent/gpg-agent.c:1969 scd/scdaemon.c:1269
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已停止\n"
@@ -1106,7 +1106,7 @@ msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1506 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
 #: g10/keygen.c:2934 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
@@ -1119,7 +1119,7 @@ msgstr "祇有第二版卡片纔能用這個指令\n"
 msgid "Reset Code not or not anymore available\n"
 msgstr "(再也) 沒有重設碼\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1236 g10/card-util.c:1315
+#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
 #: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
@@ -1129,143 +1129,143 @@ msgstr "你要選哪一個? "
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:486
+#: g10/card-util.c:492
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:487
+#: g10/card-util.c:493
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:487
+#: g10/card-util.c:493
 msgid "unspecified"
 msgstr "未特定"
 
-#: g10/card-util.c:514
+#: g10/card-util.c:520
 msgid "not forced"
 msgstr "不強迫使用"
 
-#: g10/card-util.c:514
+#: g10/card-util.c:520
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:595
+#: g10/card-util.c:601
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
 
-#: g10/card-util.c:597
+#: g10/card-util.c:603
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: 不能使用 \"<\" 字符.\n"
 
-#: g10/card-util.c:599
+#: g10/card-util.c:605
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:616
+#: g10/card-util.c:622
 msgid "Cardholder's surname: "
 msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:618
+#: g10/card-util.c:624
 msgid "Cardholder's given name: "
 msgstr "卡片持有者的名字: "
 
-#: g10/card-util.c:636
+#: g10/card-util.c:642
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:657
+#: g10/card-util.c:663
 msgid "URL to retrieve public key: "
 msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:665
+#: g10/card-util.c:671
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:761 tools/no-libgcrypt.c:30
+#: g10/card-util.c:767 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "配置足夠的記憶體時出錯: %s\n"
 
-#: g10/card-util.c:773 g10/import.c:283
+#: g10/card-util.c:779 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時出錯: %s\n"
 
-#: g10/card-util.c:800
+#: g10/card-util.c:806
 msgid "Login data (account name): "
 msgstr "登入資料 (帳號名稱): "
 
-#: g10/card-util.c:810
+#: g10/card-util.c:816
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:845
+#: g10/card-util.c:851
 msgid "Private DO data: "
 msgstr "私人的 DO 資料: "
 
-#: g10/card-util.c:855
+#: g10/card-util.c:861
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:905
+#: g10/card-util.c:911
 msgid "Language preferences: "
 msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:913
+#: g10/card-util.c:919
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 無效的偏好設定字串長度\n"
 
-#: g10/card-util.c:922
+#: g10/card-util.c:928
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
 
-#: g10/card-util.c:943
+#: g10/card-util.c:949
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性別 ((M)男性, (F)女性或留空): "
 
-#: g10/card-util.c:957
+#: g10/card-util.c:963
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:978
+#: g10/card-util.c:984
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:1001
+#: g10/card-util.c:1007
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 無效的格式化指紋.\n"
 
-#: g10/card-util.c:1049
+#: g10/card-util.c:1055
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:1050
+#: g10/card-util.c:1056
 msgid "not an OpenPGP card"
 msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:1059
+#: g10/card-util.c:1065
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得現用金鑰資訊時出錯: %s\n"
 
-#: g10/card-util.c:1143
+#: g10/card-util.c:1149
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1163 g10/card-util.c:1172
+#: g10/card-util.c:1169 g10/card-util.c:1178
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1184
+#: g10/card-util.c:1190
 msgid "Replace existing keys? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1193
+#: g10/card-util.c:1199
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1276,124 +1276,124 @@ msgstr ""
 "   PIN = `%s'     管理者 PIN = `%s'\n"
 "你應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1227
+#: g10/card-util.c:1233
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇你要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1229 g10/card-util.c:1306
+#: g10/card-util.c:1235 g10/card-util.c:1312
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1230 g10/card-util.c:1308
+#: g10/card-util.c:1236 g10/card-util.c:1314
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1231 g10/card-util.c:1310
+#: g10/card-util.c:1237 g10/card-util.c:1316
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1247 g10/card-util.c:1326 g10/keyedit.c:945
+#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
 #: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1303
+#: g10/card-util.c:1309
 msgid "Please select where to store the key:\n"
 msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1338
+#: g10/card-util.c:1344
 msgid "unknown key protection algorithm\n"
 msgstr "未知的金鑰保護演算法\n"
 
-#: g10/card-util.c:1343
+#: g10/card-util.c:1349
 msgid "secret parts of key are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/card-util.c:1348
+#: g10/card-util.c:1354
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放在卡片上了\n"
 
-#: g10/card-util.c:1417 g10/keyedit.c:1380
+#: g10/card-util.c:1423 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "離開這個選單"
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1425
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1420 g10/keyedit.c:1383
+#: g10/card-util.c:1426 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:1422
+#: g10/card-util.c:1428
 msgid "list all available data"
 msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1431
 msgid "change card holder's name"
 msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:1426
+#: g10/card-util.c:1432
 msgid "change URL to retrieve key"
 msgstr "變更取回金鑰的 URL"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1433
 msgid "fetch the key specified in the card URL"
 msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1434
 msgid "change the login name"
 msgstr "變更登入名稱"
 
-#: g10/card-util.c:1429
+#: g10/card-util.c:1435
 msgid "change the language preferences"
 msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:1430
+#: g10/card-util.c:1436
 msgid "change card holder's sex"
 msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1437
 msgid "change a CA fingerprint"
 msgstr "變更某個憑證中心 (CA) 的指紋"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1438
 msgid "toggle the signature force PIN flag"
 msgstr "切換簽章是否強制使用 PIN 的旗標"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1439
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1440
 msgid "menu to change or unblock the PIN"
 msgstr "變更或解凍 PIN 的選單"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1441
 msgid "verify the PIN and list all data"
 msgstr "驗證 PIN 並列出所有的資料"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1442
 msgid "unblock the PIN using a Reset Code"
 msgstr "用重設碼來解凍 PIN"
 
-#: g10/card-util.c:1558 g10/keyedit.c:1654
+#: g10/card-util.c:1564 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "指令> "
 
-#: g10/card-util.c:1601
+#: g10/card-util.c:1607
 msgid "Admin-only command\n"
 msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:1632
+#: g10/card-util.c:1638
 msgid "Admin commands are allowed\n"
 msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:1634
+#: g10/card-util.c:1640
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1720 g10/keyedit.c:2277
+#: g10/card-util.c:1726 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
@@ -6625,8 +6625,9 @@ msgstr "|N|沒有活動達 N 秒後就與卡片斷線"
 msgid "do not use a reader's keypad"
 msgstr "不要使用讀卡機鍵盤"
 
-#: scd/scdaemon.c:140
-msgid "allow the use of admin card commands"
+#: scd/scdaemon.c:141
+#, fuzzy
+msgid "deny the use of admin card commands"
 msgstr "允許使用管理者卡片指令"
 
 #: scd/scdaemon.c:254
@@ -6641,16 +6642,16 @@ msgstr ""
 "語法: scdaemon [選項] [指令 [引數]]\n"
 "GnuPg 智慧卡服務\n"
 
-#: scd/scdaemon.c:718
+#: scd/scdaemon.c:720
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "請使用 `--daemon' 選項來將此程式執行於背景\n"
 
-#: scd/scdaemon.c:1072
+#: scd/scdaemon.c:1074
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "用於 fd %d 的經手程式已啟動\n"
 
-#: scd/scdaemon.c:1084
+#: scd/scdaemon.c:1086
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "用於 fd %d 的經手程式已終止\n"